Merge Trond

[m6w6/libmemcached] / clients / memflush.c

diff --git a/clients/memflush.c b/clients/memflush.c
index 12034adba47e249619b65775b8d66d8ecf375150..9f2b57c65ff9ba2fff11ba793a1b31d274316f64 100644 (file)
--- a/clients/memflush.c
+++ b/clients/memflush.c
@@ -1,4 +1,15 @@
-#include "libmemcached/common.h"
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
+ */
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -11,6 +22,8 @@ static int opt_binary= 0;
 static int opt_verbose= 0;
 static time_t opt_expire= 0;
 static char *opt_servers= NULL;
+static char *opt_username;
+static char *opt_passwd;
 
 #define PROGRAM_NAME "memflush"
 #define PROGRAM_DESCRIPTION "Erase all data in a server of memcached servers."
@@ -21,7 +34,7 @@ void options_parse(int argc, char *argv[]);
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
-  memcached_return rc;
+  memcached_return_t rc;
   memcached_server_st *servers;
 
   options_parse(argc, argv);
@@ -46,11 +59,17 @@ 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_flush(memc, opt_expire);
-  if (rc != MEMCACHED_SUCCESS) 
+  if (rc != MEMCACHED_SUCCESS)
   {
-    fprintf(stderr, "memflush: memcache error %s", 
+    fprintf(stderr, "memflush: memcache error %s",
            memcached_strerror(memc, rc));
     if (memc->cached_errno)
       fprintf(stderr, " system error %s", strerror(memc->cached_errno));
@@ -61,6 +80,8 @@ int main(int argc, char *argv[])
 
   free(opt_servers);
 
+  shutdown_sasl();
+
   return 0;
 }
 
@@ -81,12 +102,14 @@ void options_parse(int argc, char *argv[])
     {(OPTIONSTRING)"servers", required_argument, NULL, OPT_SERVERS},
     {(OPTIONSTRING)"expire", required_argument, NULL, OPT_EXPIRE},
     {(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},
   };
   int option_index= 0;
   int option_rv;
 
-  while (1) 
+  while (1)
   {
     option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
     if (option_rv == -1) break;
@@ -115,6 +138,12 @@ void options_parse(int argc, char *argv[])
     case OPT_EXPIRE: /* --expire */
       opt_expire= (time_t)strtoll(optarg, (char **)NULL, 10);
       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);