Merge in updates for sasl.

[awesomized/libmemcached] / clients / memcat.cc

diff --git a/clients/memcat.cc b/clients/memcat.cc
index fdbcb67ea5180edee241bfe378aa2235dbf3ca0c..66ee3253b37b616700133ab17eea6c8a37374d7b 100644 (file)
--- a/clients/memcat.cc
+++ b/clients/memcat.cc
@@ -81,10 +81,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)
   {
-    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)
@@ -170,8 +175,6 @@ int main(int argc, char *argv[])
   if (opt_hash)
     free(opt_hash);
 
-  shutdown_sasl();
-
   return return_code;
 }