Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 9bbf3c80 9bbf3c8060c85f16b6223c02b7b831bdcca5718d by Sergey Poznyakoff
Options

Bugfix. 

* lib/tcpwrap.c (mu_tcp_wrapper_cb_hosts_deny_syslog):
(mu_tcp_wrapper_cb_hosts_allow_syslog): Use syslog priorities,
not facilities.
(tcpwrapper_param): Rename allow-syslog-level and
deny-syslog-level to allow-syslog-priority and
deny-syslog-priority, correspondingly.
1 parent a7c8a70c
Inline Side-by-side
Showing 2 changed files with 16 additions and 10 deletions
2008-08-17 Sergey Poznyakoff <gray@gnu.org.ua>
Bugfix.
* lib/tcpwrap.c (mu_tcp_wrapper_cb_hosts_deny_syslog):
(mu_tcp_wrapper_cb_hosts_allow_syslog): Use syslog priorities,
not facilities.
(tcpwrapper_param): Rename allow-syslog-level and
deny-syslog-level to allow-syslog-priority and
deny-syslog-priority, correspondingly.
Version 1.9.92.
* imap4d/list.c (imap4d_list): Fix addslash condition.
......
......@@ -56,9 +56,9 @@ int
mu_tcp_wrapper_cb_hosts_allow_syslog (mu_debug_t debug, void *data,
char *arg)
{
if (mu_string_to_syslog_facility (arg, &allow_severity))
if (mu_string_to_syslog_priority (arg, &allow_severity))
mu_cfg_format_error (debug, MU_DEBUG_ERROR,
_("Unknown syslog facility `%s'"),
_("Unknown syslog priority `%s'"),
arg);
return 0;
}
......@@ -66,9 +66,9 @@ mu_tcp_wrapper_cb_hosts_allow_syslog (mu_debug_t debug, void *data,
int
mu_tcp_wrapper_cb_hosts_deny_syslog (mu_debug_t debug, void *data, char *arg)
{
if (mu_string_to_syslog_facility (arg, &deny_severity))
if (mu_string_to_syslog_priority (arg, &deny_severity))
mu_cfg_format_error (debug, MU_DEBUG_ERROR,
_("Unknown syslog facility `%s'"),
_("Unknown syslog priority `%s'"),
arg);
return 0;
}
......@@ -105,15 +105,13 @@ struct mu_cfg_param tcpwrapper_param[] = {
N_("Use file for negative client address access control "
"(default: /etc/hosts.deny)."),
N_("file") },
{ "allow-syslog-level", mu_cfg_callback, NULL, 0,
{ "allow-syslog-priority", mu_cfg_callback, NULL, 0,
mu_tcp_wrapper_cb_hosts_allow_syslog,
N_("Log host allows at this syslog level. See logging { facility } for "
"a description of argument syntax."),
N_("Log host allows at this syslog priority."),
N_("level") },
{ "deny-syslog-level", mu_cfg_callback, NULL, 0,
{ "deny-syslog-priority", mu_cfg_callback, NULL, 0,
mu_tcp_wrapper_cb_hosts_deny_syslog,
N_("Log host denies at this syslog level. See logging { facility } for "
"a description of argument syntax."),
N_("Log host denies at this syslog priority."),
N_("level") },
{ NULL }
};
......