X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fbin%2Fcommon%2Foptions.hpp;h=65018eff0d077fb3d3f41974120f8f28c0ec19f7;hb=000bce60d1b956664898d77db980952d01849b8c;hp=70be59039d877b713c88e3a7ff11de29b70b812b;hpb=adec10db28a123bc0d64f8d1ff70b51b5ea5c435;p=awesomized%2Flibmemcached

diff --git a/src/bin/common/options.hpp b/src/bin/common/options.hpp
index 70be5903..65018eff 100644
--- a/src/bin/common/options.hpp
+++ b/src/bin/common/options.hpp
@@ -19,12 +19,12 @@
 #include <cstdint>
 #include <climits>
 #include <functional>
-#include <getopt.h>
 #include <iostream>
 #include <string>
 #include <vector>
 
 #include "libmemcached/common.h"
+#include "p9y/getopt.hpp"
 
 class client_options {
 public:
@@ -94,13 +94,13 @@ public:
     def("username", 'u', required_argument, "SASL username.")
         .apply = [](const client_options &opt, const extended_option &ext, memcached_st *memc) {
       if (auto username = ext.arg) {
-        if (!LIBMEMCACHED_WITH_SASL_SUPPORT) {
+#if !LIBMEMCACHED_WITH_SASL_SUPPORT
           if (!opt.isset("quiet")) {
             std::cerr
                 << "SASL username was supplied, but binary was not built with SASL support.\n";
-            return false;
           }
-        }
+          return false;
+#else
         if (memc) {
           if (MEMCACHED_SUCCESS
               != memcached_set_sasl_auth_data(memc, username, opt.argof("password"))) {
@@ -110,6 +110,7 @@ public:
             return false;
           }
         }
+#endif
       }
       return true;
     };