From 95ffa6859587102dff666dff485800b40f4c6c58 Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Sun, 22 Apr 2007 04:22:10 -0700
Subject: [PATCH] [svn] Force nickTS to increase when a local user changes
 their nick.

---
 ChangeLog             | 11 +++++++++++
 include/serno.h       |  2 +-
 modules/core/m_nick.c | 10 +++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f30337ae..102e24e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+jilles      2007/04/15 20:18:54 UTC	(20070415-3416)
+  Log:
+  Remove #define UFLAGS. We haven't allowed this
+  undocumented extension to the IRC protocol for
+  years (allowing an initial umode in USER).
+  
+
+  Changes:	Modified:
+  +0 -2		trunk/modules/m_user.c (File Modified) 
+
+
 jilles      2007/04/15 16:54:50 UTC	(20070415-3414)
   Log:
   Move new_local_user hook, so it is possible to call
diff --git a/include/serno.h b/include/serno.h
index 48ef6cc6..3f9a44f2 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070415-3414"
+#define SERNO "20070415-3416"
diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index c80a0e7d..326ab1a6 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_nick.c 1885 2006-08-28 10:09:50Z jilles $
+ *  $Id: m_nick.c 3418 2007-04-22 11:22:10Z jilles $
  */
 
 #include "stdinc.h"
@@ -78,7 +78,7 @@ struct Message save_msgtab = {
 mapi_clist_av1 nick_clist[] = { &nick_msgtab, &uid_msgtab, &euid_msgtab,
 	&save_msgtab, NULL };
 
-DECLARE_MODULE_AV1(nick, NULL, NULL, nick_clist, NULL, NULL, "$Revision: 1885 $");
+DECLARE_MODULE_AV1(nick, NULL, NULL, nick_clist, NULL, NULL, "$Revision: 3418 $");
 
 static int change_remote_nick(struct Client *, struct Client *, time_t,
 			      const char *, int);
@@ -786,7 +786,11 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
 	/* dont reset TS if theyre just changing case of nick */
 	if(!samenick)
 	{
-		source_p->tsinfo = CurrentTime;
+		/* force the TS to increase -- jilles */
+		if (source_p->tsinfo >= CurrentTime)
+			source_p->tsinfo++;
+		else
+			source_p->tsinfo = CurrentTime;
 		monitor_signoff(source_p);
 		/* we only do bancache for local users -- jilles */
 		if(source_p->user)