Merge in updates for sasl.

[awesomized/libmemcached] / clients / memdump.cc

diff --git a/clients/memdump.cc b/clients/memdump.cc
index 6f3c3e53796c3cebd8aa3e81ba12c94320b855a6..2b7b96fa50d13c959330f9af9972963ec3fe285f 100644 (file)
--- a/clients/memdump.cc
+++ b/clients/memdump.cc
@@ -97,12 +97,15 @@ int main(int argc, char *argv[])
     return EXIT_FAILURE;
   }
 
-  if (opt_username and initialize_sasl(memc, opt_username, opt_passwd) == false)
+  if (opt_username)
   {
-    std::cerr << "Failed to initialize SASL support." << std::endl;
-
-    memcached_free(memc);
-    return EXIT_FAILURE;
+    memcached_return_t ret;
+    if (memcached_failed(ret= memcached_set_sasl_auth_data(memc, opt_username, opt_passwd)))
+    {
+      std::cerr << memcached_last_error_message(memc) << std::endl;
+      memcached_free(memc);
+      return EXIT_FAILURE;
+    }
   }
 
   rc= memcached_dump(memc, callbacks, NULL, 1);
@@ -122,8 +125,6 @@ int main(int argc, char *argv[])
   if (opt_hash)
     free(opt_hash);
 
-  shutdown_sasl();
-
   return EXIT_SUCCESS;
 }