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

Merge branch 'master' into authd-framework-2

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-25 21:01:48 -05:00
commit f49198a67f
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
authd/authd.c
View file

@ -29,9 +29,10 @@ static void handle_stat(int parc, char *parv[]);
rb_helper *authd_helper = NULL; rb_helper *authd_helper = NULL;
authd_cmd_handler authd_cmd_handlers[256] = { authd_cmd_handler authd_cmd_handlers[256] = {
<<<<<<< HEAD
['C'] = handle_new_connection, ['C'] = handle_new_connection,
['D'] = resolve_dns, ['D'] = resolve_dns,
['H'] = handle_reload, ['R'] = handle_reload,
['S'] = handle_stat, ['S'] = handle_stat,
}; };
@ -67,7 +68,10 @@ handle_reload(int parc, char *parv[])
if(parc < 2) if(parc < 2)
{ {
warn_opers(L_CRIT, "BUG: handle_reload received too few parameters (at least 2 expected, got %d)", parc); /* Reload all handlers */
for(size_t i = 0; i < sizeof(authd_reload_handlers); handler = authd_reload_handlers[i++])
handler(parv[1][0]);
return; return;
} }

2
ircd/dns.c
View file

@ -303,7 +303,7 @@ void
reload_nameservers(void) reload_nameservers(void)
{ {
check_authd(); check_authd();
rb_helper_write(authd_helper, "H D"); rb_helper_write(authd_helper, "R D");
(void)get_nameservers(stats_results_callback, NULL); (void)get_nameservers(stats_results_callback, NULL);
} }