Merge in updates for sasl.

[awesomized/libmemcached] / clients / memcp.cc

diff --git a/clients/memcp.cc b/clients/memcp.cc
index 2a73390bad50eb771c069cd45aa9864e3653b9e6..7b7454760e7e8a4cd36db8a675e91f08930fbc13 100644 (file)
--- a/clients/memcp.cc
+++ b/clients/memcp.cc
@@ -123,11 +123,15 @@ int main(int argc, char *argv[])
     return EXIT_FAILURE;
   }
 
-  if (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;
+    }
   }
 
   while (optind < argc)
@@ -216,7 +220,6 @@ int main(int argc, char *argv[])
     free(opt_servers);
   if (opt_hash)
     free(opt_hash);
-  shutdown_sasl();
 
   return return_code;
 }