Mercurial > dovecot > core-2.2
changeset 15709:18661d1d6ed0
auth: first/last_valid_uid settings shouldn't have had auth_ prefix.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Fri, 01 Feb 2013 01:03:05 +0200 |
parents | 4a59737dd2ca |
children | c5230b8ffd40 |
files | src/auth/auth-settings.c src/auth/auth-settings.h |
diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/auth-settings.c Thu Jan 31 22:59:13 2013 +0200 +++ b/src/auth/auth-settings.c Fri Feb 01 01:03:05 2013 +0200 @@ -210,8 +210,6 @@ DEF(SET_STR, winbind_helper_path), DEF(SET_STR, proxy_self), DEF(SET_TIME, failure_delay), - DEF(SET_UINT, first_valid_uid), - DEF(SET_UINT, last_valid_uid), DEF(SET_BOOL, verbose), DEF(SET_BOOL, debug), @@ -228,6 +226,8 @@ DEF_NOPREFIX(SET_STR, base_dir), DEF_NOPREFIX(SET_BOOL, verbose_proctitle), + DEF_NOPREFIX(SET_UINT, first_valid_uid), + DEF_NOPREFIX(SET_UINT, last_valid_uid), SETTING_DEFINE_LIST_END }; @@ -249,8 +249,6 @@ .winbind_helper_path = "/usr/bin/ntlm_auth", .proxy_self = "", .failure_delay = 2, - .first_valid_uid = 500, - .last_valid_uid = 0, .verbose = FALSE, .debug = FALSE, @@ -266,7 +264,9 @@ .userdbs = ARRAY_INIT, .base_dir = PKG_RUNDIR, - .verbose_proctitle = FALSE + .verbose_proctitle = FALSE, + .first_valid_uid = 500, + .last_valid_uid = 0, }; const struct setting_parser_info auth_setting_parser_info = {
--- a/src/auth/auth-settings.h Thu Jan 31 22:59:13 2013 +0200 +++ b/src/auth/auth-settings.h Fri Feb 01 01:03:05 2013 +0200 @@ -42,8 +42,6 @@ const char *winbind_helper_path; const char *proxy_self; unsigned int failure_delay; - unsigned int first_valid_uid; - unsigned int last_valid_uid; bool verbose, debug, debug_passwords; const char *verbose_passwords; @@ -53,11 +51,14 @@ unsigned int worker_max_count; + /* settings that don't have auth_ prefix: */ ARRAY(struct auth_passdb_settings *) passdbs; ARRAY(struct auth_userdb_settings *) userdbs; const char *base_dir; bool verbose_proctitle; + unsigned int first_valid_uid; + unsigned int last_valid_uid; /* generated: */ char username_chars_map[256];