X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=clients%2Fmemdump.c;h=3654be2b0d3a9f529b15e83cdfcf0a764be85845;hb=3fca91c00a13fa7d6650bfe65aabf074fa5579b5;hp=4329c1bdd099db1b7a53ccba9653d10dd633142f;hpb=55b5455291498ef63c1c34976552d58708a74732;p=m6w6%2Flibmemcached

diff --git a/clients/memdump.c b/clients/memdump.c
index 4329c1bd..3654be2b 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,9 +39,11 @@ 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 __attribute__((unused)),
                                       const char *key, size_t key_length,
                                       void *context __attribute__((unused)))
 {
@@ -85,6 +88,11 @@ 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 1;
+  }
 
   rc= memcached_dump(memc, callbacks, NULL, 1);
 
@@ -103,6 +111,8 @@ int main(int argc, char *argv[])
   if (opt_hash)
     free(opt_hash);
 
+  shutdown_sasl();
+
   return 0;
 }
 
@@ -120,6 +130,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 +166,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);