Merge in fixes for SASL.

[m6w6/libmemcached] / clients / memrm.cc

diff --git a/clients/memrm.cc b/clients/memrm.cc
index d4d93c2e9c2621e80b3bc56613889f715802f231..0551e326755969ff714f30ba1916be6bf0f12a74 100644 (file)
--- a/clients/memrm.cc
+++ b/clients/memrm.cc
@@ -10,11 +10,13 @@
  */
 #include "config.h"
 
-#include <stdio.h>
-#include <unistd.h>
+#include <cstdio>
+#include <cstring>
 #include <getopt.h>
+#include <iostream>
+#include <unistd.h>
+
 #include <libmemcached/memcached.h>
-#include <string.h>
 #include "client_options.h"
 #include "utilities.h"
 
@@ -43,7 +45,7 @@ int main(int argc, char *argv[])
   options_parse(argc, argv);
   initialize_sockets();
 
-  if (!opt_servers)
+  if (opt_servers == 0)
   {
     char *temp;
 
@@ -65,8 +67,18 @@ int main(int argc, char *argv[])
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t) opt_binary);
 
-  if (!initialize_sasl(memc, opt_username, opt_passwd))
+  if (opt_username and LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+  {
+    memcached_free(memc);
+    std::cerr << "--username was supplied, but binary was not built with SASL support." << std::endl;
+    return EXIT_FAILURE;
+  }
+
+
+  if (opt_username and initialize_sasl(memc, opt_username, opt_passwd) == false)
   {
+    std::cerr << "Failed to initialize SASL support." << std::endl;
+
     memcached_free(memc);
     return EXIT_FAILURE;
   }