From 1a339033f34d0ce6719ef4f5308b757ef43cbfd2 Mon Sep 17 00:00:00 2001
From: attilamolnar
Date: Sun, 27 May 2012 23:05:12 +0200
Subject: Fix generating invalid UIDs after current_uid is 000Z99999 (next UID
 became 000[AAAAA)

---
 src/server.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index dab920bb6..092826361 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -101,20 +101,12 @@ void InspIRCd::IncrementUID(int pos)
 	 * A again, in an iterative fashion.. so..
 	 * AAA9 -> AABA, and so on. -- w00t
 	 */
-	if (pos == 3)
+	if ((pos == 3) && (current_uid[3] == '9'))
 	{
 		// At pos 3, if we hit '9', we've run out of available UIDs, and need to reset to AAA..AAA.
-		if (current_uid[pos] == '9')
+		for (int i = 3; i < UUID_LENGTH-1; i++)
 		{
-			for (int i = 3; i < (UUID_LENGTH - 1); i++)
-			{
-				current_uid[i] = 'A';
-			}
-		}
-		else
-		{
-			// Buf if we haven't, just keep incrementing merrily.
-			current_uid[pos]++;
+			current_uid[i] = 'A';
 		}
 	}
 	else
-- 
cgit v1.3.1-10-gc9f91


From ae6e056a011fc16af67e8dc311c4ace902e163fb Mon Sep 17 00:00:00 2001
From: attilamolnar
Date: Sun, 27 May 2012 23:08:14 +0200
Subject: While at it, use a constant parameter for calling IncrementUID in
 GetUID Get rid of curindex, use a bool to determine if we need to initialize

---
 src/server.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index 092826361..adaaa7d2c 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -138,17 +138,18 @@ void InspIRCd::IncrementUID(int pos)
  */
 std::string InspIRCd::GetUID()
 {
-	static int curindex = -1;
+	static bool inited = false;
 
 	/*
-	 * If -1, we're setting up. Copy SID into the first three digits, 9's to the rest, null term at the end
+	 * If we're setting up, copy SID into the first three digits, 9's to the rest, null term at the end
 	 * Why 9? Well, we increment before we find, otherwise we have an unnecessary copy, and I want UID to start at AAA..AA
 	 * and not AA..AB. So by initialising to 99999, we force it to rollover to AAAAA on the first IncrementUID call.
 	 * Kind of silly, but I like how it looks.
 	 *		-- w
 	 */
-	if (curindex == -1)
+	if (!inited)
 	{
+		inited = true;
 		current_uid[0] = Config->sid[0];
 		current_uid[1] = Config->sid[1];
 		current_uid[2] = Config->sid[2];
@@ -156,8 +157,6 @@ std::string InspIRCd::GetUID()
 		for (int i = 3; i < (UUID_LENGTH - 1); i++)
 			current_uid[i] = '9';
 
-		curindex = UUID_LENGTH - 2; // look at the end of the string now kthx, ignore null
-
 		// Null terminator. Important.
 		current_uid[UUID_LENGTH - 1] = '\0';
 	}
@@ -165,7 +164,7 @@ std::string InspIRCd::GetUID()
 	while (1)
 	{
 		// Add one to the last UID
-		this->IncrementUID(curindex);
+		this->IncrementUID(UUID_LENGTH - 2);
 
 		if (this->FindUUID(current_uid))
 		{
-- 
cgit v1.3.1-10-gc9f91