Mercurial > dovecot > core-2.2
changeset 10352:7a206ede2e7e HEAD
dsync: Require "server" parameter to start in server mode.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 17 Nov 2009 19:57:53 -0500 |
| parents | ffac955d80ef |
| children | 415a87bdeacd |
| files | src/dsync/dsync.c |
| diffstat | 1 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dsync/dsync.c Tue Nov 17 19:41:21 2009 -0500 +++ b/src/dsync/dsync.c Tue Nov 17 19:57:53 2009 -0500 @@ -75,7 +75,7 @@ struct mail_user *mail_user; struct dsync_worker *worker1, *worker2; const char *error, *username, *mailbox = NULL, *cmd = NULL; - bool dest = TRUE, readonly = FALSE; + bool dsync_server = FALSE, readonly = FALSE; int c, ret, fd_in = STDIN_FILENO, fd_out = STDOUT_FILENO; master_service = master_service_init("dsync", @@ -111,6 +111,10 @@ usage(); } } + if (optind != argc && strcmp(argv[optind], "server") == 0) { + dsync_server = TRUE; + optind++; + } if (optind != argc) usage(); master_service_init_finish(master_service); @@ -128,14 +132,15 @@ if (cmd != NULL) { /* user initialization may exec doveconf, so do our forking after that */ - run_cmd(cmd, &fd_in, &fd_out); - dest = FALSE; + run_cmd(t_strconcat(cmd, " server", NULL), &fd_in, &fd_out); + } else if (!dsync_server) { + usage(); } worker1 = dsync_worker_init_local(mail_user); if (readonly) dsync_worker_set_readonly(worker1); - if (dest) { + if (dsync_server) { i_set_failure_prefix(t_strdup_printf("dsync-dest(%s): ", username)); server = dsync_proxy_server_init(fd_in, fd_out, worker1);