Cosmetic changes to banning bare IPv6 addresses and kicking +D-hidden users.

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

diff --git a/ChangeLog b/ChangeLog
index ca229557ce19ed2e74edad687ae8e1173ae7675c..c14fa4d64bf62f1f8ab68d50653df2aea01b1594 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-12  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/channel.c (pretty_mask): Recognize ':' as unique to the
+       host part of a ban mask.
+
+2005-08-03  Jan Krueger <jast@heapsort.de>
+
+       * ircd/m_kick.c (m_kick): Send JOIN prior to confirming KICK on
+       invisible member.
+
 2005-08-08  Michael Poole <mdpoole@troilus.org>
 
        * ircd/channel.c (find_ban): For non-IPmask bans, match the ban

diff --git a/ircd/channel.c b/ircd/channel.c
index 7a9990266e5413c9b737daf7dca377bf6ac5ad9e..fcbf7070b401b9d3dc066fd1ce2a2465f1f6f684 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -1109,9 +1109,10 @@ char *pretty_mask(char *mask)
       user = mask;
       host = ++ptr;
     }
-    else if (*ptr == '.')
+    else if (*ptr == '.' || *ptr == ':')
     {
-      /* Case 2: Found last '.' (without finding a '!' or '@' yet) */
+      /* Case 2: Found character specific to IP or hostname (without
+       * finding a '!' or '@' yet) */
       last_dot = ptr;
       continue;
     }

diff --git a/ircd/m_kick.c b/ircd/m_kick.c
index 40ec73fab0d5d68068dcb0da43addbd8a879844e..f77bee5d7e76deed972bae0e410fe238360cc41f 100644 (file)
--- a/ircd/m_kick.c
+++ b/ircd/m_kick.c
@@ -160,6 +160,7 @@ int m_kick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
      * the kicking and the victim */
     if (MyUser(who))
       sendcmdto_one(sptr, CMD_KICK, who, "%H %C :%s", chptr, who, comment);
+    sendcmdto_one(who, CMD_JOIN, sptr, "%H", chptr);
     sendcmdto_one(sptr, CMD_KICK, sptr, "%H %C :%s", chptr, who, comment);
     CheckDelayedJoins(chptr);
   } else