This may not compile, I'll test it on my desktop. Waiting 20 minutes for a build is unacceptable.

- Move UUID initialisation to InspIRCd::InitialiseUID()
- Call it if we run out of existing UUIDs
- Call it on startup

Just a small cleanup.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8007 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 5 insertions, 3 deletions

diff --git a/src/server.cpp b/src/server.cpp
index ea2ec4928..2722c6831 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -173,9 +173,11 @@ std::string InspIRCd::GetUID()
 
 			if (current_uid[3] == 'Z')
 			{
-				/* If we get to here, we need to wrap around to AAAA. */
-				for(int j = 3; j < UUID_LENGTH - 1; j++)
-					current_uid[j] = 'A';
+				/*
+				 * Ugh. We have run out of room.. roll back around to the
+				 * start of the UUID namespace. -- w00t
+				 */
+				this->InitialiseUID();
 
 				/*
 				 * and now we need to break the inner for () to continue the while (),