BUILD : 1.7.11 (905) BUGS : NOTES : Fixed up config; UserKeys can be safely missing again, you get a real warning when they are identical, and fixed a small grammar error in the GlobalOnCycle warning just above

git-svn-id: svn://svn.anope.org/anope/trunk@905 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@651 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 9 insertions, 7 deletions

diff --git a/Changes b/Changes
index 1e90a0dda..f79775951 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version  S V N
 Provided by Anope Dev. <dev@anope.org> - 2005
 09/29 A Configuration option to change fantasy command prefix character.  [ #00]
 09/28 A Event for fantasy commands triggered without channel access.      [ #00]
+10/01 F UserKeys gave an error without message when missing.              [ #00]
 09/30 F Stripping fantasy character from fantasy commands.                [ #00]
 09/28 F Made module (un)loading code more friendly for modularized core.  [ #00]
 09/28 F NickServ SASET didn't fill the nick in the 'not registered' line. [ #00]
diff --git a/src/config.c b/src/config.c
index cf75ce052..d24af1ca3 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1355,7 +1355,7 @@ int read_config(int reload)
 
     if (GlobalOnCycle) {
         if (!GlobalOnCycleMessage && !GlobalOnCycleUP) {
-            alog("GlobalOnCycleMessage and GlobalOnCycleUP are not defined disabling GlobalOnCycle");
+            alog("GlobalOnCycleMessage and GlobalOnCycleUP are not defined; disabling GlobalOnCycle");
             GlobalOnCycle = 0;
         }
     }
@@ -1363,11 +1363,8 @@ int read_config(int reload)
     /* Check the user keys */
     if ((UserKey1 == UserKey2) || (UserKey1 == UserKey3)
         || (UserKey3 == UserKey2)) {
-        alog("Every UserKey must be different. It's for YOUR safety! Remember that!");
-        retval = 0;
-    }
-    if (UserKey1 == 9866235) {
-        alog("You don't want your network secure? You are supposed to set NEW UserKey values!!!");
+        printf
+            ("Every UserKey must be different. It's for YOUR safety! Remember that!\n");
         retval = 0;
     }
 
diff --git a/version.log b/version.log
index dfef70c00..5f7347fbd 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="11"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="904"
+VERSION_BUILD="905"
 
 # $Log$
 #
+# BUILD : 1.7.11 (905)
+# BUGS  : 
+# NOTES : Fixed up config; UserKeys can be safely missing again, you get a real warning when they are identical, and fixed a small grammar error in the GlobalOnCycle warning just above
+#
 # BUILD : 1.7.11 (904)
 # BUGS  : 
 # NOTES : Stripping fantasy char from fantasy commands now