Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-05-15 17:37:34 UTC
Modified files:
ChangeLog ircd/s_conf.c
Log message:
Forward port 2.10.11 rehash fixes.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.409 ircu2.10/ChangeLog:1.410
--- ircu2.10/ChangeLog:1.409 Sat May 15 10:17:19 2004
+++ ircu2.10/ChangeLog Sat May 15 10:37:21 2004
@@ -1,3 +1,9 @@
+2004-05-15 Michael Poole <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
[Original ChangeLog date: 2003-06-27 -MDP]
Index: ircu2.10/ircd/s_conf.c
diff -u ircu2.10/ircd/s_conf.c:1.51 ircu2.10/ircd/s_conf.c:1.52
--- ircu2.10/ircd/s_conf.c:1.51 Sun May 9 20:08:14 2004
+++ ircu2.10/ircd/s_conf.c Sat May 15 10:37:22 2004
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_conf.c,v 1.51 2004/05/10 03:08:14 entrope Exp $
+ * $Id: s_conf.c,v 1.52 2004/05/15 17:37:22 entrope Exp $
*/
#include "config.h"
@@ -1053,6 +1053,8 @@
*/
clearNickJupes();
+ clear_quarantines();
+
if (sig != 2)
restart_resolver();
@@ -1097,8 +1099,8 @@
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;
----------------------- End of diff -----------------------
