Mercurial > dovecot > core-2.2
changeset 15921:75d76f1b884d
doveadm: Renamed doveadm_proxy_port setting to doveadm_port.
There's still an alias for doveadm_proxy_port.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sun, 24 Feb 2013 19:35:39 +0200 |
parents | df3da60fa137 |
children | b2bc9dd5f8d9 |
files | src/doveadm/doveadm-mail-server.c src/doveadm/doveadm-settings.c src/doveadm/doveadm-settings.h |
diffstat | 3 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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 = "_",
--- 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;