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

Tweak some configuration semantics of opm

Browse source
This commit is contained in:
Elizabeth Myers 2016-04-02 19:45:09 -05:00
parent d9364d2913
commit c1f4db3fb7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ircd/newconf.c
View file

@ -2054,7 +2054,7 @@ conf_end_opm(struct TopConf *tc)
if(!rb_dlink_list_length(&yy_opm_scanner_list)) if(!rb_dlink_list_length(&yy_opm_scanner_list))
{ {
conf_report_error("No opm scanners configured, disabling opm."); conf_report_error("No opm scanners configured -- disabling opm.");
fail = true; fail = true;
goto end; goto end;
} }
@ -2089,10 +2089,13 @@ conf_end_opm(struct TopConf *tc)
/* If there's no listeners... */ /* If there's no listeners... */
fail = (yy_opm_port_ipv4 == 0 || yy_opm_port_ipv6 == 0); fail = (yy_opm_port_ipv4 == 0 || yy_opm_port_ipv6 == 0);
if(!fail && yy_opm_timeout > 0 && yy_opm_timeout < 60)
if(!fail && yy_opm_timeout > 0)
/* Send timeout */ /* Send timeout */
set_authd_timeout("opm_timeout", yy_opm_timeout); set_authd_timeout("opm_timeout", yy_opm_timeout);
else if(fail)
conf_report_error("No opm listeners -- disabling");
else if(yy_opm_timeout <= 0 || yy_opm_timeout >= 60)
conf_report_error("opm::timeout value is invalid -- ignoring");
end: end:
RB_DLINK_FOREACH_SAFE(ptr, nptr, yy_opm_scanner_list.head) RB_DLINK_FOREACH_SAFE(ptr, nptr, yy_opm_scanner_list.head)