Merge in updates for sasl.

[awesomized/libmemcached] / clients / memflush.cc

diff --git a/clients/memflush.cc b/clients/memflush.cc
index b19c286067c627801ff853fb6f0368c95e5c5000..1ef1bfde52629e9775573c8f6ef57691c46503a0 100644 (file)
--- a/clients/memflush.cc
+++ b/clients/memflush.cc
@@ -69,11 +69,15 @@ int main(int argc, char *argv[])
     return EXIT_FAILURE;
   }
 
-
-  if (!initialize_sasl(memc, opt_username, opt_passwd))
+  if (opt_username)
   {
-    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_flush(memc, opt_expire);
@@ -90,8 +94,6 @@ int main(int argc, char *argv[])
 
   free(opt_servers);
 
-  shutdown_sasl();
-
   return EXIT_SUCCESS;
 }