X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconnect.c;h=c4b263e1fe2fadcd8f917aa223b81e17146cf418;hb=4c23dcdab4f9c9941eb245bda2ff65371fca13d7;hp=7b38def933762ad29d29c52cf7f5a2952b520bbd;hpb=2230ba7b89bbaa989de311f9d7ea6d6e2cd5a9b8;p=awesomized%2Flibmemcached

diff --git a/libmemcached/connect.c b/libmemcached/connect.c
index 7b38def9..c4b263e1 100644
--- a/libmemcached/connect.c
+++ b/libmemcached/connect.c
@@ -80,7 +80,6 @@ static memcached_return_t connect_poll(memcached_server_st *ptr)
         return MEMCACHED_ERRNO;
       }
     }
-    WATCHPOINT_ASSERT(0); // Programming error
   }
 
   // This should only be possible from ERESTART or EINTR;
@@ -537,7 +536,7 @@ memcached_return_t memcached_connect(memcached_server_write_instance_st ptr)
   case MEMCACHED_CONNECTION_TCP:
     rc= network_connect(ptr);
 #ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
-    if (ptr->fd != INVALID_SOCKET && ptr->root->sasl && ptr->root->sasl->callbacks)
+    if (ptr->fd != INVALID_SOCKET && ptr->root->sasl.callbacks)
     {
       rc= memcached_sasl_authenticate_connection(ptr);
       if (rc != MEMCACHED_SUCCESS)