irc2.11.2p3

Author: Jarkko Oikarinen

common/parse.c

@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static const volatile char rcsid[] = "@(#)$Id: parse.c,v 1.96 2008/06/10 22:06:53 chopin Exp $";
+static const volatile char rcsid[] = "@(#)$Id: parse.c,v 1.97 2010/08/12 16:29:30 bif Exp $";
 #endif
 
 #include "os.h"
@@ -901,8 +901,9 @@ static	int	cancel_clients(aClient *cptr, aClient *sptr, char *cmd)
 	if (IsServer(cptr))
 	    {
 		sendto_serv_butone(NULL, ":%s KILL %s :%s (%s[%s] != %s)",
-				   me.name, sptr->name, me.name,
-				   sptr->name, sptr->from->name,
+				   me.name,
+				   sptr->user ? sptr->user->uid : sptr->name,
+				   me.name, sptr->name, sptr->from->name,
 				   get_client_name(cptr, TRUE));
 		sptr->flags |= FLAGS_KILLED;
 		return exit_client(cptr, sptr, &me, "Fake Prefix");

common/patchlevel.h

@@ -17,6 +17,6 @@
  */
 
 #ifndef	PATCHLEVEL
-#define PATCHLEVEL "0211020002"		/* for server identification */
+#define PATCHLEVEL "0211020003"		/* for server identification */
 #define DEVLEVEL 'a'
 #endif

doc/AUTHORS

@@ -173,7 +173,7 @@ Helmut Springer <[email protected]>
 Michael 'Eumel' Neumayer <[email protected]>
 Kurt Roeckx <[email protected]> cleaned up the compression code, among many things
 Roar Thron�s <[email protected]> for more IPv6 work
-Piotr Kucharski <chopin@sgh.waw.pl> for his work on the anti socks module
+Piotr Kucharski <chopin@42.pl> for his work on the anti socks module
 Michal Svoboda <[email protected]> removed useless anUser linked list
 
 Thanks go to those persons not mentioned here who have added their advice,

doc/ChangeLog

@@ -1,3 +1,36 @@
+2.11.2p3
+
+2010-08-12  Piotr Kucharski
+
+	* channel.c/can_send(): bans and exceptions set with cidr work only
+	  on local server. side-effect of this was if you set non-cidr ban
+	  (say *@*) plus a cidr exception, you were no longer heard outside
+	  your server (you matched the ban, but cidr exception was not even
+	  checked). allow remote clients to talk without checking for bans
+	  and exceptions. (reported by BR).
+	* s_err.c, s_serv.c, s_user.c: fix various format string errors
+	  visible on amd64 (patch from jilles).
+	* parse.c/cancel_clients(), s_user.c/register_user(): fix all kills 
+	  that sent a nick to send a UID, except the impossible nick collision
+	  kill (patch from jilles).
+
+2010-08-11  Piotr Kucharski
+
+	* s_conf.c/prep_kline(): reject all not fully specified u@h masks and
+	  also *@* one.
+	* ircd.c/s_die(): clean up unix socket.
+	* s_service.c/m_service(): send SERVICE also to dist matching SID.
+
+2010-03-09  Piotr Kucharski
+
+	* s_conf.c/prep_kline(): match_ipmask() was getting host with '@' char
+	  prepended, that did not work at all.
+
+2009-12-11  Piotr Kucharski
+
+	* s_conf.c/prep_kline(): oper can crash his local ircd by issuing
+	  tkline with wrong parameters (reported by AsmPro).
+
 2.11.2p2
 
 2009-11-13  Piotr Kucharski