Forward port 2.10.11 rehash fixes.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1059 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index e1950891ccce55d55227bcc7f22b3f469b460834..06c7676fcf3e97a130cbd983f87f9ecbb1653f89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-15  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/s_conf.c (rehash): Call clear_quarantines on rehash since
+       2.10.11 does.  Show ident and IP for clients being killed by new
+       G-lines and K-lines.
+
 2004-05-15  hikari <shadow@undernet.org>
 
        [Original ChangeLog date: 2003-06-27 -MDP]

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 7733c9f8e26cfc01e277db2ade0bcf73311db099..88020f1a07e2c9f8666a9a2033fee8110a6ae669 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -1053,6 +1053,8 @@ int rehash(struct Client *cptr, int sig)
    */
   clearNickJupes();
 
+  clear_quarantines();
+
   if (sig != 2)
     restart_resolver();
 
@@ -1097,8 +1099,8 @@ int rehash(struct Client *cptr, int sig)
         sendto_opmask_butone(0, found_g == -2 ? SNO_GLINE : SNO_OPERKILL,
                              found_g == -2 ? "G-line active for %s%s" :
                              "K-line active for %s%s",
-                             IsUnknown(acptr) ? "Unregistered Client ":"",                     
-                             get_client_name(acptr, HIDE_IP));
+                             IsUnknown(acptr) ? "Unregistered Client ":"",
+                             get_client_name(acptr, SHOW_IP));
         if (exit_client(cptr, acptr, &me, found_g == -2 ? "G-lined" :
             "K-lined") == CPTR_KILLED)
           ret = CPTR_KILLED;