From: NurPech Date: Mon, 7 Jan 2013 18:07:43 +0000 (+0100) Subject: Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=9a7baf0638dac261b1aea690fae5f52caf674812;hp=e943c784d37a4b287e58712f4a9db6f5d594b7c4 Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ Conflicts: src/mod-hostserv.c --- diff --git a/src/mod-hostserv.c b/src/mod-hostserv.c index 21da053..a2e50d3 100644 --- a/src/mod-hostserv.c +++ b/src/mod-hostserv.c @@ -766,8 +766,10 @@ static MODCMD_FUNC(cmd_addhost) { reply("HSMSG_FAKEHOST_TOPLEVEL_ALREADY_EXISTS", slfh_name, tlfh_name); return 0; } - if(irccasecmp(tlfh_name, "*")) - reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name); + if(irccasecmp(tlfh_name, "*")) { + reply("HSMSG_ACCESS_DENIED"); + return 0; + } hs_add_toplevel(tlfh_name); reply("HSMSG_FAKEHOST_TOPLEVEL_ADDED", tlfh_name); } else { @@ -904,6 +906,10 @@ static MODCMD_FUNC(cmd_renamehost) { if(ctlfh) { reply("HSMSG_FAKEHOST_TOPLEVEL_ALREADY_EXISTS", new_slfh_name, new_tlfh_name); return 0; + } + if(irccasecmp(new_tlfh_name, "*")) { + reply("HSMSG_ACCESS_DENIED"); + return 0; } if(strcmp(new_tlfh_name, tlfh->fakehost)) hs_rename_toplevel(tlfh, new_tlfh_name);