From e02967bd4a78eba1646e6089406a443ecf13fe8a Mon Sep 17 00:00:00 2001
From: Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Wed, 5 May 2010 16:52:39 +0000
Subject: [PATCH] Print an error if the TS6 SID isn't set/is set incorrectly,
 most people don't know how to work logfiles

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2930 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/modules.c             | 22 ++++++++++++----------
 src/protocol/inspircd12.c |  6 ++++++
 version.log               |  3 ++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/modules.c b/src/modules.c
index a5195bb54..8e5bb8be7 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -173,7 +173,7 @@ int encryption_module_init(void) {
  **/
 int protocol_module_init(void)
 {
-    int ret = 0;
+    int ret = 0, noforksave = nofork;
     Module *m;
 	
     m = createModule(IRCDModule);
@@ -190,21 +190,23 @@ int protocol_module_init(void)
 		 * as we only have the ircd struct filled here, we have to over
 		 * here. -GD
 		 */
-	    if (UseTokens && !(ircd->token)) {
-    	    alog("Anope does not support TOKENS for this ircd setting; unsetting UseToken");
-        	UseTokens = 0;
-	    }
+		if (UseTokens && !ircd->token) {
+			alog("Anope does not support TOKENS for this ircd setting; unsetting UseToken");
+			UseTokens = 0;
+		}
 		
-		if (UseTS6 && !(ircd->ts6)) {
+		if (UseTS6 && !ircd->ts6) {
 			alog("Chosen IRCd does not support TS6, unsetting UseTS6");
 			UseTS6 = 0;
 		}
 		
 		/* We can assume the ircd supports TS6 here */
-    	if (UseTS6 && !Numeric) {
-        	alog("UseTS6 requires the setting of Numeric to be enabled.");
-	        ret = -1;
-    	}
+                if (UseTS6 && !Numeric) {
+                    nofork = 1; /* We're going down, set nofork so this error is printed */
+                    alog("UseTS6 requires the setting of Numeric to be enabled.");
+                    nofork = noforksave;
+                    ret = -1;
+                }
 	} else {
 		destroyModule(m);
 	}
diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index fefe004bf..e887db7e0 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -2636,19 +2636,25 @@ void moduleAddAnopeCmds()
  **/
 int AnopeInit(int argc, char **argv)
 {
+    int noforksave = nofork;
+
     moduleAddAuthor("Anope");
     moduleAddVersion("$Id$");
     moduleSetType(PROTOCOL);
 
     if (!UseTS6) {
+        nofork = 1; /* We're going down, set nofork so this error is printed */
         alog("FATAL ERROR: The InspIRCd 1.2 protocol module requires UseTS6 to be enabled in the services.conf.");
+        nofork = noforksave;
         return MOD_STOP;
     }
 
     if (Numeric && is_sid(Numeric))
         TS6SID = sstrdup(Numeric);
     else {
+        nofork = 1; /* We're going down, set nofork so this error is printed */
         alog("FATAL ERROR: The InspIRCd 1.2 protocol module requires the Numeric in the services.conf to contain a TS6SID.");
+        nofork = noforksave;
         return MOD_STOP;
     }
 
diff --git a/version.log b/version.log
index 228f16bad..93a79d716 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="4"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="2929"
+VERSION_BUILD="2930"
 
 # $Log$ # Changes since the 1.8.4 Release
+#Revision 2930 - Print an error if the TS6 SID isn't set/is set incorrectly, most people don't know how to work logfiles
 #Revision 2929 - Added an internal event called when a nick is requested
 #Revision 2918 - Fixed deleting nick requests to only delete the requested nick
 #Revision 2903 - Removed some unnecessary redundant code in cs_clear