dovecotpw binary is now accessed via "doveadm pw".

--HG--
branch : HEAD

diff --git a/.hgignore b/.hgignore
index e8c6a2859f99398ddf79c74b808fe34814711ddc..c1e9c122fc4be5098bf83a05d96993933f0775f2 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -79,7 +79,6 @@ src/plugins/fts-squat/squat-test
 src/pop3-login/pop3-login
 src/pop3/pop3
 src/util/authtest
-src/util/dovecotpw
 src/util/gdbhelper
 src/util/idxview
 src/util/imap-utf7

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index 3669720005659fa770ce101f65b223e7d20a8d02..e0842165cb50c22c8e4d60468a616bfff1ca4d05 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -12,13 +12,24 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/auth \
        -DPKG_RUNDIR=\""$(rundir)"\"
 
+cmd_pw_libs = \
+       ../auth/libpassword.a \
+       ../lib-ntlm/libntlm.a \
+       ../lib-otp/libotp.a
+
 doveadm_LDADD = \
+       $(cmd_pw_libs) $(AUTH_LIBS) \
        $(LIBDOVECOT_STORAGE) \
        $(LIBDOVECOT) \
        $(MODULE_LIBS)
-doveadm_DEPENDENCIES = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT)
+doveadm_DEPENDENCIES = \
+       $(cmd_pw_libs) \
+       $(LIBDOVECOT_STORAGE) \
+       $(LIBDOVECOT)
+
 doveadm_SOURCES = \
        doveadm.c \
+       doveadm-pw.c \
        doveadm-mail.c
 
 noinst_HEADERS = \

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 8347d15dd344278f94a3d6c4d4096817000b65c6..4ba05c9462ab9e8de726b2b82a4e145ae238ee3e 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -211,9 +211,7 @@ doveadm_mail_cmd(doveadm_mail_command_t *cmd, int argc, char *argv[])
                        service_flags |= MAIL_STORAGE_SERVICE_FLAG_DEBUG;
                        break;
                default:
-                       if (!master_service_parse_option(master_service,
-                                                        c, optarg))
-                               usage();
+                       usage();
                }
        }
        if (!all_users) {
@@ -253,7 +251,7 @@ void doveadm_mail_usage(void)
        const struct doveadm_mail_cmd *cmd;
 
        array_foreach(&doveadm_mail_cmds, cmd) {
-               fprintf(stderr, "  %s <user>|-a", cmd->name);
+               fprintf(stderr, USAGE_CMDNAME_FMT" <user>|-a", cmd->name);
                if (cmd->usage_args != NULL)
                        fprintf(stderr, " %s", cmd->usage_args);
                fputc('\n', stderr);

diff --git a/src/util/dovecotpw.c b/src/doveadm/doveadm-pw.c
similarity index 58%
rename from src/util/dovecotpw.c
rename to src/doveadm/doveadm-pw.c
index cc9cc5e53359dc963f6991786dfe98378672a77b..10ef833eb5fc9329710eca4af7109e4e991e62b7 100644 (file)
--- a/src/util/dovecotpw.c
+++ b/src/doveadm/doveadm-pw.c
@@ -4,7 +4,7 @@
 #include "array.h"
 #include "password-scheme.h"
 #include "randgen.h"
-#include "safe-memset.h"
+#include "doveadm.h"
 
 #include <ctype.h>
 #include <fcntl.h>
@@ -12,36 +12,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#ifdef HAVE_LIBGEN_H
-#  include <libgen.h>
-#endif
-
 #define DEFAULT_SCHEME "CRAM-MD5"
 
-static void ATTR_NORETURN
-usage(const char *s)
-{
-       fprintf(stderr,
-           "usage: %s [-l] [-p plaintext] [-s scheme] [-u user] [-V]\n", s);
-       fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n",
-           "    -l            List known password schemes",
-           "    -p plaintext  New password",
-           "    -s scheme     Password scheme",
-           "    -u user       Username (if scheme uses it)",
-           "    -V            Internally verify the hash");
-
-       exit(1);
-}
-
-int main(int argc, char *argv[])
+static void cmd_pw(int argc, char *argv[])
 {
        const char *hash = NULL;
        const char *user = NULL;
-       char *scheme = NULL;
-       char *plaintext = NULL;
+       const char *scheme = NULL;
+       const char *plaintext = NULL;
        int ch, lflag = 0, Vflag = 0;
 
-       lib_init();
        random_init();
        password_schemes_init();
        
@@ -51,21 +31,20 @@ int main(int argc, char *argv[])
                        lflag = 1;
                        break;
                case 'p':
-                       plaintext = i_strdup(optarg);
-                       safe_memset(optarg, 0, strlen(optarg));
+                       plaintext = optarg;
                        break;
                case 's':
-                       scheme = i_strdup(optarg);
+                       scheme = optarg;
                        break;
                case 'u':
-                       user = i_strdup(optarg);
+                       user = optarg;
                        break;
                case 'V':
                        Vflag = 1;
                        break;
                case '?':
                default:
-                       usage(basename(*argv));
+                       help(&doveadm_cmd_pw);
                }
        }
 
@@ -81,31 +60,19 @@ int main(int argc, char *argv[])
        }
 
        if (argc != optind)
-               usage(basename(*argv));
-
-       if (scheme == NULL)
-               scheme = i_strdup(DEFAULT_SCHEME);
-       else {
-               char *c;
-               for (c = scheme; *c != '\0'; c++)
-                       *c = i_toupper(*c);
-       }
-
+               help(&doveadm_cmd_pw);
 
+       scheme = scheme == NULL ? DEFAULT_SCHEME : t_str_ucase(scheme);
        while (plaintext == NULL) {
-               char *check;
+               const char *check;
                static int lives = 3;
 
-               plaintext = i_strdup(getpass("Enter new password: "));
-               check = i_strdup(getpass("Retype new password: "));
+               plaintext = t_strdup(getpass("Enter new password: "));
+               check = t_strdup(getpass("Retype new password: "));
                if (strcmp(plaintext, check) != 0) {
                        fprintf(stderr, "Passwords don't match!\n");
                        if (--lives == 0)
                                exit(1);
-                       safe_memset(plaintext, 0, strlen(plaintext));
-                       safe_memset(check, 0, strlen(check));
-                       i_free(plaintext);
-                       i_free(check);
                        plaintext = NULL;
                }
        }
@@ -133,6 +100,13 @@ int main(int argc, char *argv[])
                printf("{%s}%s (verified)\n", scheme, hash);
        } else
                printf("{%s}%s\n", scheme, hash);
-
-        return 0;
 }
+
+struct doveadm_cmd doveadm_cmd_pw = {
+       cmd_pw, "pw", "[-l] [-p plaintext] [-s scheme] [-u user] [-V]",
+"  -l            List known password schemes\n"
+"  -p plaintext  New password\n"
+"  -s scheme     Password scheme\n"
+"  -u user       Username (if scheme uses it)\n"
+"  -V            Internally verify the hash\n"
+};

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 2f6e292f4ac9afb6f620ad67532f12bf808015f5..d73f5bca7fc8b46967387617b96ec60c8ab849d5 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -1,6 +1,7 @@
 /* Copyright (c) 2009 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
+#include "array.h"
 #include "master-service.h"
 #include "doveadm-mail.h"
 #include "doveadm.h"
@@ -9,13 +10,64 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+static ARRAY_DEFINE(doveadm_cmds, struct doveadm_cmd);
+
+void doveadm_register_cmd(const struct doveadm_cmd *cmd)
+{
+       array_append(&doveadm_cmds, cmd, 1);
+}
+
 void usage(void)
 {
+       const struct doveadm_cmd *cmd;
+
        fprintf(stderr, "usage: doveadm\n");
+
+       array_foreach(&doveadm_cmds, cmd) {
+               fprintf(stderr, USAGE_CMDNAME_FMT" %s\n",
+                       cmd->name, cmd->short_usage);
+       }
        doveadm_mail_usage();
        exit(1);
 }
 
+void help(const struct doveadm_cmd *cmd)
+{
+       fprintf(stderr, "doveadm %s %s\n", cmd->name, cmd->short_usage);
+       if (cmd->long_usage != NULL)
+               fprintf(stderr, "%s", cmd->long_usage);
+       exit(0);
+}
+
+static void cmd_help(int argc ATTR_UNUSED, char *argv[])
+{
+       const struct doveadm_cmd *cmd;
+
+       if (argv[1] == NULL)
+               usage();
+       array_foreach(&doveadm_cmds, cmd) {
+               if (strcmp(cmd->name, argv[1]) == 0)
+                       help(cmd);
+       }
+       usage();
+}
+static struct doveadm_cmd doveadm_cmd_help = {
+       cmd_help, "help", "<cmd>", NULL
+};
+
+static bool doveadm_try_run(const char *cmd_name, int argc, char *argv[])
+{
+       const struct doveadm_cmd *cmd;
+
+       array_foreach(&doveadm_cmds, cmd) {
+               if (strcmp(cmd_name, cmd->name) == 0) {
+                       cmd->cmd(argc, argv);
+                       return TRUE;
+               }
+       }
+       return FALSE;
+}
+
 int main(int argc, char *argv[])
 {
        const char *cmd_name, *getopt_str;
@@ -24,7 +76,10 @@ int main(int argc, char *argv[])
        master_service = master_service_init("doveadm",
                                             MASTER_SERVICE_FLAG_STANDALONE,
                                             argc, argv);
+       i_array_init(&doveadm_cmds, 32);
        doveadm_mail_init();
+       doveadm_register_cmd(&doveadm_cmd_help);
+       doveadm_register_cmd(&doveadm_cmd_pw);
 
        /* "+" is GNU extension to stop at the first non-option.
           others just accept -+ option. */
@@ -40,10 +95,12 @@ int main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 
-       if (!doveadm_mail_try_run(cmd_name, argc, argv))
+       if (!doveadm_try_run(cmd_name, argc, argv) &&
+           doveadm_mail_try_run(cmd_name, argc, argv))
                usage();
 
        master_service_deinit(&master_service);
        doveadm_mail_deinit();
+       array_free(&doveadm_cmds);
        return 0;
 }

diff --git a/src/doveadm/doveadm.h b/src/doveadm/doveadm.h
index 1ddfa8d852f65f545ffa1847584cd3a3ed3f17bd..e2c79570be4aa1c12e46934d915f8a86f73f5727 100644 (file)
--- a/src/doveadm/doveadm.h
+++ b/src/doveadm/doveadm.h
@@ -1,6 +1,22 @@
 #ifndef DOVEADM_H
 #define DOVEADM_H
 
+#define USAGE_CMDNAME_FMT "  %-12s"
+
+typedef void doveadm_command_t(int argc, char *argv[]);
+
+struct doveadm_cmd {
+       doveadm_command_t *cmd;
+       const char *name;
+       const char *short_usage;
+       const char *long_usage;
+};
+
+extern struct doveadm_cmd doveadm_cmd_pw;
+
+void doveadm_register_cmd(const struct doveadm_cmd *cmd);
+
 void usage(void);
+void help(const struct doveadm_cmd *cmd);
 
 #endif

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index fe0aba4ffc973d603eed31b486924aa97cd36509..e513c582857794ce14057dc6bc99999350d88a41 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -12,8 +12,6 @@ pkglibexec_PROGRAMS = \
        maildirlock \
        threadview
 
-sbin_PROGRAMS = dovecotpw
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
        -I$(top_srcdir)/src/lib-auth \
@@ -75,17 +73,3 @@ threadview_LDADD = $(LIBDOVECOT)
 threadview_DEPENDENCIES = $(LIBDOVECOT)
 threadview_SOURCES = \
        threadview.c
-
-dovecotpw_libs = \
-       ../auth/libpassword.a \
-       ../lib-ntlm/libntlm.a \
-       ../lib-otp/libotp.a \
-       $(LIBDOVECOT)
-
-dovecotpw_LDADD = \
-       $(dovecotpw_libs) \
-       $(AUTH_LIBS)
-dovecotpw_DEPENDENCIES = $(dovecotpw_libs)
-
-dovecotpw_SOURCES = \
-       dovecotpw.c