doveadm config is now alias for doveconf.

--HG--
branch : HEAD

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 464c6728322cfabd3408f5be788e1f49618b1532..642e6842d832d2d7c8026aab40f1546478614155 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -10,6 +10,7 @@ nodist_man1_MANS = \
        doveadm.1 \
        doveadm-altmove.1 \
        doveadm-auth.1 \
+       doveadm-config.1 \
        doveadm-director.1 \
        doveadm-dump.1 \
        doveadm-expunge.1 \

diff --git a/doc/man/doveadm-config.1 b/doc/man/doveadm-config.1
new file mode 100644 (file)
index 0000000..e6fe3ec
--- /dev/null
+++ b/doc/man/doveadm-config.1
@@ -0,0 +1 @@
+.so man1/doveconf.1
\ No newline at end of file

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index 5ee9893a1180bb3b0c72455011fd4190bf14ef8a..43755d28f2ff32b5a4b739971ad027b07aef96a5 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
        -DMODULEDIR=\""$(moduledir)"\" \
        -DDOVEADM_MODULEDIR=\""$(doveadm_moduledir)"\" \
        -DPKG_RUNDIR=\""$(rundir)"\" \
+       -DBINDIR=\""$(bindir)"\" \
        -DMANDIR=\""$(mandir)"\"
 
 if !BUILD_SHARED_LIBS

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 4a1a6b3941a5fc74825ca56066bb2af047ecb440..c0e0d6a1945173d17febb0103cba204e174538d8 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -179,6 +179,17 @@ static struct doveadm_cmd doveadm_cmd_help = {
        cmd_help, "help", "<cmd>", NULL
 };
 
+static void cmd_config(int argc ATTR_UNUSED, char *argv[])
+{
+       argv[0] = BINDIR"/doveconf";
+       (void)execv(argv[0], argv);
+       i_fatal("execv(%s) failed: %m", argv[0]);
+}
+
+static struct doveadm_cmd doveadm_cmd_config = {
+       cmd_config, "config", "[doveconf parameters]", NULL
+};
+
 static bool
 doveadm_try_run_multi_word(const struct doveadm_cmd *cmd,
                           const char *cmdname, int argc, char *argv[])
@@ -273,6 +284,7 @@ static void doveadm_read_settings(void)
 
 static struct doveadm_cmd *doveadm_commands[] = {
        &doveadm_cmd_help,
+       &doveadm_cmd_config,
        &doveadm_cmd_stop,
        &doveadm_cmd_reload,
        &doveadm_cmd_auth,