From: danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Mon, 12 Oct 2009 13:09:14 +0000 (+0000)
Subject: Fix empty SID validation and generation
X-Git-Tag: v2.0.23~1402
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=f741fa6e3c57107a88f1752dbed06af850a2525d;p=user%2Fhenk%2Fcode%2Finspircd.git

Fix empty SID validation and generation

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 22d4e36dc..87ee8789b 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -412,7 +412,7 @@ static bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem
 
 	const std::string& sid = data.GetValue();
 
-	if (!ServerInstance->IsSID(sid))
+	if (!sid.empty() && !ServerInstance->IsSID(sid))
 	{
 		throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
 	}
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 7e9d56734..56e43c3ed 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -568,7 +568,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	if (Config->sid.empty())
 	{
 		// Generate one
-		int sid = 0;
+		unsigned int sid = 0;
 		char sidstr[4];
 
 		for (const char* x = Config->ServerName.c_str(); *x; ++x)