Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ
authorNurPech <nurpech@nurpech.de>
Mon, 7 Jan 2013 18:07:43 +0000 (19:07 +0100)
committerNurPech <nurpech@nurpech.de>
Mon, 7 Jan 2013 18:07:43 +0000 (19:07 +0100)
Conflicts:
src/mod-hostserv.c

1  2 
src/mod-hostserv.c

index 46ea66db30dc0077695c727bdc6e07cd1a8fd727,21da053ac7d026d14684bff2ca709b8042d1df92..a2e50d30aa8ee1c860ae8d0d9b2215198a8361d5
@@@ -766,10 -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_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
++                  reply("HSMSG_ACCESS_DENIED");
 +                  return 0;   
 +        }
          hs_add_toplevel(tlfh_name);
          reply("HSMSG_FAKEHOST_TOPLEVEL_ADDED", tlfh_name);
      } else {
@@@ -906,10 -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;
-                   reply("HSMSG_UNKNOWN_FAKEHOST", slfh_name, tlfh_name);
 +        }
 +              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);