X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemdump.c;h=0e81dad491849f43c8b9b668b5f2cdd640bc3f63;hb=6bc6cf720913ae042f36e62e09abce7d340607ab;hp=4329c1bdd099db1b7a53ccba9653d10dd633142f;hpb=7c986323bd4eece0d805f4df17eb03ea094f84f6;p=awesomized%2Flibmemcached

diff --git a/clients/memdump.c b/clients/memdump.c
index 4329c1bd..0e81dad4 100644
--- a/clients/memdump.c
+++ b/clients/memdump.c
@@ -9,7 +9,8 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
@@ -38,12 +39,15 @@ static int opt_binary=0;
 static int opt_verbose= 0;
 static char *opt_servers= NULL;
 static char *opt_hash= NULL;
+static char *opt_username;
+static char *opt_passwd;
 
 /* Print the keys and counter how many were found */
-static memcached_return_t key_printer(memcached_st *ptr __attribute__((unused)),
+static memcached_return_t key_printer(const memcached_st *ptr,
                                       const char *key, size_t key_length,
-                                      void *context __attribute__((unused)))
+                                      void *context)
 {
+  (void)ptr;(void)context;
   printf("%.*s\n", (uint32_t)key_length, key);
 
   return MEMCACHED_SUCCESS;
@@ -85,14 +89,19 @@ int main(int argc, char *argv[])
   memcached_server_list_free(servers);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
                          (uint64_t)opt_binary);
+  if (!initialize_sasl(memc, opt_username, opt_passwd))
+  {
+    memcached_free(memc);
+    return EXIT_FAILURE;
+  }
 
   rc= memcached_dump(memc, callbacks, NULL, 1);
 
   if (rc != MEMCACHED_SUCCESS)
   {
     fprintf(stderr, "memdump: memcache error %s", memcached_strerror(memc, rc));
-    if (memc->cached_errno)
-      fprintf(stderr, " system error %s", strerror(memc->cached_errno));
+    if (memcached_last_error_errno(memc))
+      fprintf(stderr, " system error %s", strerror(memcached_last_error_errno(memc)));
     fprintf(stderr, "\n");
   }
 
@@ -103,7 +112,9 @@ int main(int argc, char *argv[])
   if (opt_hash)
     free(opt_hash);
 
-  return 0;
+  shutdown_sasl();
+
+  return EXIT_SUCCESS;
 }
 
 static void options_parse(int argc, char *argv[])
@@ -120,6 +131,8 @@ static void options_parse(int argc, char *argv[])
       {(OPTIONSTRING)"servers", required_argument, NULL, OPT_SERVERS},
       {(OPTIONSTRING)"hash", required_argument, NULL, OPT_HASH},
       {(OPTIONSTRING)"binary", no_argument, NULL, OPT_BINARY},
+      {(OPTIONSTRING)"username", required_argument, NULL, OPT_USERNAME},
+      {(OPTIONSTRING)"password", required_argument, NULL, OPT_PASSWD},
       {0, 0, 0, 0}
     };
 
@@ -154,6 +167,12 @@ static void options_parse(int argc, char *argv[])
     case OPT_HASH:
       opt_hash= strdup(optarg);
       break;
+    case OPT_USERNAME:
+       opt_username= optarg;
+       break;
+    case OPT_PASSWD:
+       opt_passwd= optarg;
+       break;
     case '?':
       /* getopt_long already printed an error message. */
       exit(1);