is an IMAP and POP3 server, written with security primarily in mind.
| login-settings.c (dovecot-2.3.16) | : | login-settings.c (dovecot-2.3.17) |
|---|
| | |
| skipping to change at line 35 | | skipping to change at line 35 |
|---|
| DEF(STR_VARS, login_greeting), | | DEF(STR_VARS, login_greeting), |
| DEF(STR, login_log_format_elements), | | DEF(STR, login_log_format_elements), |
| DEF(STR, login_log_format), | | DEF(STR, login_log_format), |
| DEF(STR, login_access_sockets), | | DEF(STR, login_access_sockets), |
| DEF(STR_VARS, login_proxy_notify_path), | | DEF(STR_VARS, login_proxy_notify_path), |
| DEF(STR, login_plugin_dir), | | DEF(STR, login_plugin_dir), |
| DEF(STR, login_plugins), | | DEF(STR, login_plugins), |
| DEF(TIME_MSECS, login_proxy_timeout), | | DEF(TIME_MSECS, login_proxy_timeout), |
| DEF(UINT, login_proxy_max_reconnects), | | DEF(UINT, login_proxy_max_reconnects), |
| DEF(TIME, login_proxy_max_disconnect_delay), | | DEF(TIME, login_proxy_max_disconnect_delay), |
|
| | DEF(STR, login_proxy_rawlog_dir), |
| DEF(STR, director_username_hash), | | DEF(STR, director_username_hash), |
| | |
| DEF(BOOL, auth_ssl_require_client_cert), | | DEF(BOOL, auth_ssl_require_client_cert), |
| DEF(BOOL, auth_ssl_username_from_cert), | | DEF(BOOL, auth_ssl_username_from_cert), |
| | |
| DEF(BOOL, disable_plaintext_auth), | | DEF(BOOL, disable_plaintext_auth), |
| DEF(BOOL, auth_verbose), | | DEF(BOOL, auth_verbose), |
| DEF(BOOL, auth_debug), | | DEF(BOOL, auth_debug), |
| DEF(BOOL, verbose_proctitle), | | DEF(BOOL, verbose_proctitle), |
| | |
| | |
| skipping to change at line 63 | | skipping to change at line 64 |
|---|
| .login_greeting = PACKAGE_NAME" ready.", | | .login_greeting = PACKAGE_NAME" ready.", |
| .login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %
c session=<%{session}>", | | .login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %
c session=<%{session}>", |
| .login_log_format = "%$: %s", | | .login_log_format = "%$: %s", |
| .login_access_sockets = "", | | .login_access_sockets = "", |
| .login_proxy_notify_path = "proxy-notify", | | .login_proxy_notify_path = "proxy-notify", |
| .login_plugin_dir = MODULEDIR"/login", | | .login_plugin_dir = MODULEDIR"/login", |
| .login_plugins = "", | | .login_plugins = "", |
| .login_proxy_timeout = 30*1000, | | .login_proxy_timeout = 30*1000, |
| .login_proxy_max_reconnects = 3, | | .login_proxy_max_reconnects = 3, |
| .login_proxy_max_disconnect_delay = 0, | | .login_proxy_max_disconnect_delay = 0, |
|
| | .login_proxy_rawlog_dir = "", |
| .director_username_hash = "%u", | | .director_username_hash = "%u", |
| | |
| .auth_ssl_require_client_cert = FALSE, | | .auth_ssl_require_client_cert = FALSE, |
| .auth_ssl_username_from_cert = FALSE, | | .auth_ssl_username_from_cert = FALSE, |
| | |
| .disable_plaintext_auth = TRUE, | | .disable_plaintext_auth = TRUE, |
| .auth_verbose = FALSE, | | .auth_verbose = FALSE, |
| .auth_debug = FALSE, | | .auth_debug = FALSE, |
| .verbose_proctitle = FALSE, | | .verbose_proctitle = FALSE, |
| | |
| | |
| skipping to change at line 161 | | skipping to change at line 163 |
|---|
| } | | } |
| return dest; | | return dest; |
| } | | } |
| | |
| struct login_settings * | | struct login_settings * |
| login_settings_read(pool_t pool, | | login_settings_read(pool_t pool, |
| const struct ip_addr *local_ip, | | const struct ip_addr *local_ip, |
| const struct ip_addr *remote_ip, | | const struct ip_addr *remote_ip, |
| const char *local_name, | | const char *local_name, |
| const struct master_service_ssl_settings **ssl_set_r, | | const struct master_service_ssl_settings **ssl_set_r, |
|
| | const struct master_service_ssl_server_settings **ssl_server_
set_r, |
| void ***other_settings_r) | | void ***other_settings_r) |
| { | | { |
| struct master_service_settings_input input; | | struct master_service_settings_input input; |
| const char *error; | | const char *error; |
| const struct setting_parser_context *parser; | | const struct setting_parser_context *parser; |
| void *const *cache_sets; | | void *const *cache_sets; |
| void **sets; | | void **sets; |
| unsigned int i, count; | | unsigned int i, count; |
| | |
| i_zero(&input); | | i_zero(&input); |
| | |
| skipping to change at line 213 | | skipping to change at line 216 |
|---|
| for (i = 0; i < count; i++) | | for (i = 0; i < count; i++) |
| sets[i] = login_setting_dup(pool, input.roots[i], cache_sets[i]); | | sets[i] = login_setting_dup(pool, input.roots[i], cache_sets[i]); |
| | |
| if (settings_var_expand(&login_setting_parser_info, sets[0], pool, | | if (settings_var_expand(&login_setting_parser_info, sets[0], pool, |
| login_set_var_expand_table(&input), &error) <= 0) | | login_set_var_expand_table(&input), &error) <= 0) |
| i_fatal("Failed to expand settings: %s", error); | | i_fatal("Failed to expand settings: %s", error); |
| | |
| *ssl_set_r = | | *ssl_set_r = |
| login_setting_dup(pool, &master_service_ssl_setting_parser_info, | | login_setting_dup(pool, &master_service_ssl_setting_parser_info, |
| settings_parser_get_list(parser)[1]); | | settings_parser_get_list(parser)[1]); |
|
| | *ssl_server_set_r = |
| | login_setting_dup(pool, &master_service_ssl_server_setting_parser |
| | _info, |
| | settings_parser_get_list(parser)[2]); |
| *other_settings_r = sets + 1; | | *other_settings_r = sets + 1; |
| return sets[0]; | | return sets[0]; |
| } | | } |
| | |
| void login_settings_deinit(void) | | void login_settings_deinit(void) |
| { | | { |
| if (set_cache != NULL) | | if (set_cache != NULL) |
| master_service_settings_cache_deinit(&set_cache); | | master_service_settings_cache_deinit(&set_cache); |
| } | | } |
| | | |
| End of changes. 4 change blocks. |
|---|
| 0 lines changed or deleted | | 7 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 