9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Warn about auth blocks after a *@* auth and duplicate auth blocks.

Browse source
This commit is contained in:
Jilles Tjoelker 2009-01-31 18:42:03 +01:00
parent aa12f64bd6
commit 6e5e2b000a
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/newconf.c
View file

@ -910,7 +910,13 @@ conf_end_auth(struct TopConf *tc)
collapse(yy_aconf->user); collapse(yy_aconf->user);
collapse(yy_aconf->host); collapse(yy_aconf->host);
conf_add_class_to_conf(yy_aconf); conf_add_class_to_conf(yy_aconf);
add_conf_by_address(yy_aconf->host, CONF_CLIENT, yy_aconf->user, yy_aconf->spasswd, yy_aconf); if (find_exact_conf_by_address("*", CONF_CLIENT, "*"))
conf_report_error("Ignoring redundant auth block (after *@*)");
else if (find_exact_conf_by_address(yy_aconf->host, CONF_CLIENT, yy_aconf->user))
conf_report_error("Ignoring duplicate auth block for %s@%s",
yy_aconf->user, yy_aconf->host);
else
add_conf_by_address(yy_aconf->host, CONF_CLIENT, yy_aconf->user, yy_aconf->spasswd, yy_aconf);
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, yy_aconf_list.head)
{ {
@ -936,7 +942,13 @@ conf_end_auth(struct TopConf *tc)
conf_add_class_to_conf(yy_tmp); conf_add_class_to_conf(yy_tmp);
add_conf_by_address(yy_tmp->host, CONF_CLIENT, yy_tmp->user, yy_tmp->spasswd, yy_tmp); if (find_exact_conf_by_address("*", CONF_CLIENT, "*"))
conf_report_error("Ignoring redundant auth block (after *@*)");
else if (find_exact_conf_by_address(yy_tmp->host, CONF_CLIENT, yy_tmp->user))
conf_report_error("Ignoring duplicate auth block for %s@%s",
yy_tmp->user, yy_tmp->host);
else
add_conf_by_address(yy_tmp->host, CONF_CLIENT, yy_tmp->user, yy_tmp->spasswd, yy_tmp);
rb_dlinkDestroy(ptr, &yy_aconf_list); rb_dlinkDestroy(ptr, &yy_aconf_list);
} }