bin: consolidate clients

[awesomized/libmemcached] / src / bin / common / options.hpp

diff --git a/src/bin/common/options.hpp b/src/bin/common/options.hpp
index 27ba5433d6ac5b1d7a36a7643c09dd7e1debac2e..28ade9733c8d1b233561b22969157b5202420754 100644 (file)
--- a/src/bin/common/options.hpp
+++ b/src/bin/common/options.hpp
@@ -96,15 +96,19 @@ public:
       if (auto username = ext.arg) {
         if (!LIBMEMCACHED_WITH_SASL_SUPPORT) {
           if (!opt.isset("quiet")) {
-            std::cerr << "SASL username was supplied, but binary was not built with SASL support.\n";
+            std::cerr
+                << "SASL username was supplied, but binary was not built with SASL support.\n";
             return false;
           }
         }
-        if (MEMCACHED_SUCCESS != memcached_set_sasl_auth_data(memc, username, opt.argof("password"))) {
-          if (!opt.isset("quiet")) {
-            std::cerr << memcached_last_error_message(memc);
+        if (memc) {
+          if (MEMCACHED_SUCCESS
+              != memcached_set_sasl_auth_data(memc, username, opt.argof("password"))) {
+            if (!opt.isset("quiet")) {
+              std::cerr << memcached_last_error_message(memc);
+            }
+            return false;
           }
-          return false;
         }
       }
       return true;