From: Timo Sirainen <tss@iki.fi>
Date: Fri, 2 Jul 2010 20:52:16 +0000 (+0100)
Subject: doveadm config is now alias for doveconf.
X-Git-Tag: 2.0.rc2~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3a55999bcfe2e57941cb64343f4ea80beabdab7;p=thirdparty%2Fdovecot%2Fcore.git

doveadm config is now alias for doveconf.

--HG--
branch : HEAD
---

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 464c672832..642e6842d8 100644
--- 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
index 0000000000..e6fe3ecb1f
--- /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 5ee9893a11..43755d28f2 100644
--- 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 4a1a6b3941..c0e0d6a194 100644
--- 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,