Fix for SASL

diff --git a/libmemcached/connect.c b/libmemcached/connect.c
index b17400ab3fe80ea6e01ddcc17afe321f6d02efaa..a43de9563a89d2017b4658a3404abc8ad534bfd8 100644 (file)
--- a/libmemcached/connect.c
+++ b/libmemcached/connect.c
@@ -373,7 +373,7 @@ static memcached_return_t network_connect(memcached_server_st *ptr)
       }
 
 #ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
-      if (ptr->fd != -1 && ptr->root->sasl.callbacks != NULL)
+      if (ptr->fd != -1 && ptr->root->sasl && ptr->root->sasl->callbacks)
       {
         memcached_return rc= memcached_sasl_authenticate_connection(ptr);
         if (rc != MEMCACHED_SUCCESS)

diff --git a/libmemcached/sasl.c b/libmemcached/sasl.c
index 440b76380e2ce69f4e96c614bf7d88dda5c63440..85edeb3d18e3cbbe8e4fbc76f10c55eb86bfae1e 100644 (file)
--- a/libmemcached/sasl.c
+++ b/libmemcached/sasl.c
@@ -20,7 +20,10 @@ void memcached_set_sasl_callbacks(memcached_st *ptr,
 
 const sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr)
 {
-  return ptr->sasl->callbacks;
+  if (ptr->sasl)
+    return ptr->sasl->callbacks;
+
+  return NULL;
 }
 
 /**