dovecot-2.2: doveadm: Renamed doveadm_proxy_port setting to dove...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Feb 24 19:36:05 EET 2013
details: http://hg.dovecot.org/dovecot-2.2/rev/75d76f1b884d
changeset: 15921:75d76f1b884d
user: Timo Sirainen <tss at iki.fi>
date: Sun Feb 24 19:35:39 2013 +0200
description:
doveadm: Renamed doveadm_proxy_port setting to doveadm_port.
There's still an alias for doveadm_proxy_port.
diffstat:
src/doveadm/doveadm-mail-server.c | 4 ++--
src/doveadm/doveadm-settings.c | 5 +++--
src/doveadm/doveadm-settings.h | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diffs (55 lines):
diff -r df3da60fa137 -r 75d76f1b884d src/doveadm/doveadm-mail-server.c
--- a/src/doveadm/doveadm-mail-server.c Sun Feb 24 18:19:40 2013 +0200
+++ b/src/doveadm/doveadm-mail-server.c Sun Feb 24 19:35:39 2013 +0200
@@ -182,7 +182,7 @@
*host_r = ctx->set->doveadm_socket_path;
- if (ctx->set->doveadm_proxy_port == 0)
+ if (ctx->set->doveadm_port == 0)
return 0;
/* make sure we have an auth connection */
@@ -227,7 +227,7 @@
ret = -1;
} else {
*host_r = t_strdup_printf("%s:%u", proxy_host,
- ctx->set->doveadm_proxy_port);
+ ctx->set->doveadm_port);
}
}
pool_unref(&pool);
diff -r df3da60fa137 -r 75d76f1b884d src/doveadm/doveadm-settings.c
--- a/src/doveadm/doveadm-settings.c Sun Feb 24 18:19:40 2013 +0200
+++ b/src/doveadm/doveadm-settings.c Sun Feb 24 19:35:39 2013 +0200
@@ -58,7 +58,8 @@
DEF(SET_STR, mail_plugin_dir),
DEF(SET_STR, doveadm_socket_path),
DEF(SET_UINT, doveadm_worker_count),
- DEF(SET_UINT, doveadm_proxy_port),
+ DEF(SET_UINT, doveadm_port),
+ { SET_ALIAS, "doveadm_proxy_port", 0, NULL },
DEF(SET_STR, doveadm_password),
DEF(SET_STR, doveadm_allowed_commands),
DEF(SET_STR, dsync_alt_char),
@@ -76,7 +77,7 @@
.mail_plugin_dir = MODULEDIR,
.doveadm_socket_path = "doveadm-server",
.doveadm_worker_count = 0,
- .doveadm_proxy_port = 0,
+ .doveadm_port = 0,
.doveadm_password = "",
.doveadm_allowed_commands = "",
.dsync_alt_char = "_",
diff -r df3da60fa137 -r 75d76f1b884d src/doveadm/doveadm-settings.h
--- a/src/doveadm/doveadm-settings.h Sun Feb 24 18:19:40 2013 +0200
+++ b/src/doveadm/doveadm-settings.h Sun Feb 24 19:35:39 2013 +0200
@@ -8,7 +8,7 @@
const char *mail_plugin_dir;
const char *doveadm_socket_path;
unsigned int doveadm_worker_count;
- unsigned int doveadm_proxy_port;
+ unsigned int doveadm_port;
const char *doveadm_password;
const char *doveadm_allowed_commands;
const char *dsync_alt_char;
More information about the dovecot-cvs
mailing list