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
1 2008-08-17 Sergey Poznyakoff <gray@gnu.org.ua> 1 2008-08-17 Sergey Poznyakoff <gray@gnu.org.ua>
2 2
3 Bugfix.
4 * lib/tcpwrap.c (mu_tcp_wrapper_cb_hosts_deny_syslog):
5 (mu_tcp_wrapper_cb_hosts_allow_syslog): Use syslog priorities,
6 not facilities.
7 (tcpwrapper_param): Rename allow-syslog-level and
8 deny-syslog-level to allow-syslog-priority and
9 deny-syslog-priority, correspondingly.
10
3 Version 1.9.92. 11 Version 1.9.92.
4 12
5 * imap4d/list.c (imap4d_list): Fix addslash condition. 13 * imap4d/list.c (imap4d_list): Fix addslash condition.
......
...@@ -56,9 +56,9 @@ int ...@@ -56,9 +56,9 @@ int
56 mu_tcp_wrapper_cb_hosts_allow_syslog (mu_debug_t debug, void *data, 56 mu_tcp_wrapper_cb_hosts_allow_syslog (mu_debug_t debug, void *data,
57 char *arg) 57 char *arg)
58 { 58 {
59 if (mu_string_to_syslog_facility (arg, &allow_severity)) 59 if (mu_string_to_syslog_priority (arg, &allow_severity))
60 mu_cfg_format_error (debug, MU_DEBUG_ERROR, 60 mu_cfg_format_error (debug, MU_DEBUG_ERROR,
61 _("Unknown syslog facility `%s'"), 61 _("Unknown syslog priority `%s'"),
62 arg); 62 arg);
63 return 0; 63 return 0;
64 } 64 }
...@@ -66,9 +66,9 @@ mu_tcp_wrapper_cb_hosts_allow_syslog (mu_debug_t debug, void *data, ...@@ -66,9 +66,9 @@ mu_tcp_wrapper_cb_hosts_allow_syslog (mu_debug_t debug, void *data,
66 int 66 int
67 mu_tcp_wrapper_cb_hosts_deny_syslog (mu_debug_t debug, void *data, char *arg) 67 mu_tcp_wrapper_cb_hosts_deny_syslog (mu_debug_t debug, void *data, char *arg)
68 { 68 {
69 if (mu_string_to_syslog_facility (arg, &deny_severity)) 69 if (mu_string_to_syslog_priority (arg, &deny_severity))
70 mu_cfg_format_error (debug, MU_DEBUG_ERROR, 70 mu_cfg_format_error (debug, MU_DEBUG_ERROR,
71 _("Unknown syslog facility `%s'"), 71 _("Unknown syslog priority `%s'"),
72 arg); 72 arg);
73 return 0; 73 return 0;
74 } 74 }
...@@ -105,15 +105,13 @@ struct mu_cfg_param tcpwrapper_param[] = { ...@@ -105,15 +105,13 @@ struct mu_cfg_param tcpwrapper_param[] = {
105 N_("Use file for negative client address access control " 105 N_("Use file for negative client address access control "
106 "(default: /etc/hosts.deny)."), 106 "(default: /etc/hosts.deny)."),
107 N_("file") }, 107 N_("file") },
108 { "allow-syslog-level", mu_cfg_callback, NULL, 0, 108 { "allow-syslog-priority", mu_cfg_callback, NULL, 0,
109 mu_tcp_wrapper_cb_hosts_allow_syslog, 109 mu_tcp_wrapper_cb_hosts_allow_syslog,
110 N_("Log host allows at this syslog level. See logging { facility } for " 110 N_("Log host allows at this syslog priority."),
111 "a description of argument syntax."),
112 N_("level") }, 111 N_("level") },
113 { "deny-syslog-level", mu_cfg_callback, NULL, 0, 112 { "deny-syslog-priority", mu_cfg_callback, NULL, 0,
114 mu_tcp_wrapper_cb_hosts_deny_syslog, 113 mu_tcp_wrapper_cb_hosts_deny_syslog,
115 N_("Log host denies at this syslog level. See logging { facility } for " 114 N_("Log host denies at this syslog priority."),
116 "a description of argument syntax."),
117 N_("level") }, 115 N_("level") },
118 { NULL } 116 { NULL }
119 }; 117 };
......