Commit b24bf339 b24bf339e41212dfd1a0d88f76150ff0503b7bb2 by Sergey Poznyakoff

Remove tcp wrapper configuration keywords that did not actually change anything.

The allow_severity and deny_severity variables are valid only for tcpd and
related applications, hosts_access does not use them.

* lib/tcpwrap.c (mu_tcp_wrapper_cb_hosts_allow_syslog)
(mu_tcp_wrapper_cb_hosts_deny_syslog): Remove functions.
(allow_severity, deny_severity): Remove variables.
(tcpwrapper_param): Remove allow-syslog-priority and
deny-syslog-priority.
1 parent 48639a1c
......@@ -33,34 +33,6 @@ char *mu_tcp_wrapper_daemon;
#ifdef WITH_LIBWRAP
# include <tcpd.h>
int deny_severity = LOG_INFO;
int allow_severity = LOG_INFO;
int
mu_tcp_wrapper_cb_hosts_allow_syslog (mu_debug_t debug, void *data,
mu_config_value_t *val)
{
if (mu_cfg_assert_value_type (val, MU_CFG_STRING, debug))
return 1;
if (mu_string_to_syslog_priority (val->v.string, &allow_severity))
mu_cfg_format_error (debug, MU_DEBUG_ERROR,
_("unknown syslog priority `%s'"),
val->v.string);
return 0;
}
int
mu_tcp_wrapper_cb_hosts_deny_syslog (mu_debug_t debug, void *data,
mu_config_value_t *val)
{
if (mu_cfg_assert_value_type (val, MU_CFG_STRING, debug))
return 1;
if (mu_string_to_syslog_priority (val->v.string, &deny_severity))
mu_cfg_format_error (debug, MU_DEBUG_ERROR,
_("unknown syslog priority `%s'"),
val->v.string);
return 0;
}
int
mu_tcpwrapper_access (int fd)
......@@ -94,14 +66,6 @@ struct mu_cfg_param tcpwrapper_param[] = {
N_("Use file for negative client address access control "
"(default: /etc/hosts.deny)."),
N_("file") },
{ "allow-syslog-priority", mu_cfg_callback, NULL, 0,
mu_tcp_wrapper_cb_hosts_allow_syslog,
N_("Log host allows at this syslog priority."),
N_("level") },
{ "deny-syslog-priority", mu_cfg_callback, NULL, 0,
mu_tcp_wrapper_cb_hosts_deny_syslog,
N_("Log host denies at this syslog priority."),
N_("level") },
{ NULL }
};
......