dovecot-2.0: doveadm config is now alias for doveconf.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/c1546ed8ddb6
changeset: 11721:c1546ed8ddb6
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jul 02 21:52:16 2010 +0100
description:
doveadm config is now alias for doveconf.

diffstat:

 doc/man/Makefile.am      |   1 +
 doc/man/doveadm-config.1 |   1 +
 src/doveadm/Makefile.am  |   1 +
 src/doveadm/doveadm.c    |  12 ++++++++++++
 4 files changed, 15 insertions(+), 0 deletions(-)

diffs (57 lines):

diff -r 44be8496bc19 -r c1546ed8ddb6 doc/man/Makefile.am
--- a/doc/man/Makefile.am	Fri Jul 02 22:59:21 2010 +0300
+++ b/doc/man/Makefile.am	Fri Jul 02 21:52:16 2010 +0100
@@ -10,6 +10,7 @@
 	doveadm.1 \
 	doveadm-altmove.1 \
 	doveadm-auth.1 \
+	doveadm-config.1 \
 	doveadm-director.1 \
 	doveadm-dump.1 \
 	doveadm-expunge.1 \
diff -r 44be8496bc19 -r c1546ed8ddb6 doc/man/doveadm-config.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/man/doveadm-config.1	Fri Jul 02 21:52:16 2010 +0100
@@ -0,0 +1,1 @@
+.so man1/doveconf.1
\ No newline at end of file
diff -r 44be8496bc19 -r c1546ed8ddb6 src/doveadm/Makefile.am
--- a/src/doveadm/Makefile.am	Fri Jul 02 22:59:21 2010 +0300
+++ b/src/doveadm/Makefile.am	Fri Jul 02 21:52:16 2010 +0100
@@ -16,6 +16,7 @@
 	-DMODULEDIR=\""$(moduledir)"\" \
 	-DDOVEADM_MODULEDIR=\""$(doveadm_moduledir)"\" \
 	-DPKG_RUNDIR=\""$(rundir)"\" \
+	-DBINDIR=\""$(bindir)"\" \
 	-DMANDIR=\""$(mandir)"\"
 
 if !BUILD_SHARED_LIBS
diff -r 44be8496bc19 -r c1546ed8ddb6 src/doveadm/doveadm.c
--- a/src/doveadm/doveadm.c	Fri Jul 02 22:59:21 2010 +0300
+++ b/src/doveadm/doveadm.c	Fri Jul 02 21:52:16 2010 +0100
@@ -179,6 +179,17 @@
 	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 struct doveadm_cmd *doveadm_commands[] = {
 	&doveadm_cmd_help,
+	&doveadm_cmd_config,
 	&doveadm_cmd_stop,
 	&doveadm_cmd_reload,
 	&doveadm_cmd_auth,