BUILD : 1.7.8 (571) BUGS : NOTES : Updated userkey infos in example.conf.

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


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

5 files changed, 48 insertions, 26 deletions

diff --git a/Changes b/Changes
index 47ebaf235..fc90aeb43 100644
--- a/Changes
+++ b/Changes
@@ -2,47 +2,48 @@ Anope Version S V N
 -------------------
 Provided by Anope Dev. <dev@anope.org> - 2005
 02/05 A Support for Unreal 3.2 +I channel mode.                           [ #00]
-02/03 A Merged anope-win32 branch into the main, now Win32 ready          [ #00]
+02/03 A Merged anope-win32 branch into the main, now Win32 ready.         [ #00]
+02/07 F Updated userkey information in example.conf.                      [ #00]
 02/06 F Win32 Module Load Errors.                                         [#294]
-02/05 F Change Ident function did not update the vident                   [#293]
+02/05 F Change Ident function did not update the vident.                  [#293]
 01/30 F ChanServ help to reflect the avaiable commands.                   [ #00]
-01/30 F ChanServ still used some commands that were not valid on all ircd [ #00]
+01/30 F ChanServ used some commands that were not valid on all ircds.     [ #00]
 01/30 F Compiling modules under Mac OSX.                                  [#285]
 
 Provided by crazytoon <da.crew@gmx.net> - 2005
-02/05 A Updated German language file	                                  [ #00]
+02/05 A Updated German language file.                                     [ #00]
 
 Provided by BarkerJr <barkerjr@barkerjr.net> - 2005
-02/05 A Setting and Removal of SQLINEs on forbid of Channels and Nicks    [ #00]
+02/05 A Setting and Removal of SQLINEs on forbid of Channels and Nicks.   [ #00]
 
 
 Anope Version 1.7.8
 -------------------
 Provided by Anope Dev. <dev@anope.org> - 2005
-01/23 A Support for Ratbox IRCD (With and Without TS6)                    [ #00]
-01/23 A Support for TS6 protocol                                          [ #00]
-01/19 A Add simple smtp client, read the README in src/tools for info     [ #00]
+01/23 A Support for Ratbox IRCD (With and Without TS6).                   [ #00]
+01/23 A Support for TS6 protocol.                                         [ #00]
+01/19 A Add simple smtp client, read the README in src/tools for info.    [ #00]
 01/16 A Support for PTlinks VHOST (NEWMASK) command.                      [ #00]
-01/16 A Ulines Servers are now except from NOJOIN bans                    [#281]
-01/29 F Fixes help for HS HELP LIST                                       [#290]
-01/29 F Memoserv rsend issue                                              [#291]
+01/16 A Ulines Servers are now except from NOJOIN bans.                   [#281]
+01/29 F Fixes help for HS HELP LIST.                                      [#290]
+01/29 F Memoserv rsend issue.                                             [#291]
 01/23 F Fixed u_char warnings under OpenBSD.                              [ #00]
 01/23 F anope_cmd_ctcp() fixed it was setup wrong.                        [ #00]
 01/23 F Checks to make sure Services and Services Alias are not the same  [ #00]
-01/23 F SIGINT now shuts down Anope correctly when running with -nofork   [ #00]
+01/23 F SIGINT now shuts down Anope correctly when running with -nofork.  [ #00]
 01/23 F Attempting to set +h (helper) modes on ircd where there is no +h  [ #00]
-01/23 F Fixed problem when dealing with non-existant user privmsg         [ #00]
-01/23 F Updated IRCD, FAQ, README to be more current                      [ #00]
+01/23 F Fixed problem when dealing with non-existant user privmsg.        [ #00]
+01/23 F Updated IRCD, FAQ, README to be more current.                     [ #00]
 01/23 F Free's memory on shutdown that is in the User and Channel structs [ #00]
 01/20 F Misplaced MEMO_NO_RSEND_SELF in es.l reordered.                   [ #00]
-01/19 F OperServ HELP does not show commands not usable on that ircd      [ #25]
+01/19 F OperServ HELP does not show commands not usable on that ircd.     [ #25]
 01/16 F Help messages restricted to the right access level.               [#272]
 01/16 F Updated IGNORE system to allow ircops past in all areas.          [#275]
 01/16 F Help for /OS SET IGNORE.                                          [#271]
-01/16 F Updated language files to show the correct vhost character        [#278]
-01/16 F Disables UseRDB when MysqlSecure is enabled                       [#276]
+01/16 F Updated language files to show the correct vhost character.       [#278]
+01/16 F Disables UseRDB when MysqlSecure is enabled.                      [#276]
 01/16 F BS bots no longer flood resetting modes if its the same mode.     [#263]
-01/16 F IRCops are now except from KillonSQline and KillonSGline          [#274]
+01/16 F IRCops are now except from KillonSQline and KillonSGline.         [#274]
 01/16 F BS Badwords had a false positives if BSCaseSensitive wass enabled [#277]
 01/15 F Updated typo in example.conf.                                     [#279]
 
diff --git a/Changes.conf b/Changes.conf
index 62e671b53..8ec652a8f 100644
--- a/Changes.conf
+++ b/Changes.conf
@@ -4,6 +4,20 @@ Anope Version S V N
 
 ** MODIFIED CONFIGURATION DIRECTIVES **
 
+# UserKey1|2|3 <value> [REQUIRED]
+#     
+#     These keys are required to initiate the random number generator. These
+#     numbers MUST be random as you want your passcodes to be random. Don't
+#     give these keys to no anyone! Keep them private!
+#     For those pple who don't understand what to do here: Just pick three
+#     _different_ _random_ numbers with about 6 or 7 digits and put them here.
+#     If the keys don't work, they might be too long. Example: 
+#     UserKey1 9866235
+
+#     UserKey1 <your_first_random_number_here>
+#     UserKey2 <your_second_random_number_here>
+#     UserKey3 <you_third_random_number_here>
+
 ** DELETED  CONFIGURATION DIRECTIVES ** 
 
 Anope Version 1.7.8
diff --git a/data/example.conf b/data/example.conf
index 923528531..fb4a4f31a 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -254,11 +254,15 @@ NetworkName "LocalNet"
 #
 #     These keys are required to initiate the random number generator. These
 #     numbers MUST be random as you want your passcodes to be random. Don't
-#     give these keys to no anyone! Keep them private! 
-
-#UserKey1 9866235
-#UserKey2 5216332
-#UserKey3 9651291
+#     give these keys to no anyone! Keep them private!
+#     For those pple who don't understand what to do here: Just pick three
+#     _different_ _random_ numbers with about 6 or 7 digits and put them here.
+#     If the keys don't work, they might be too long. Example:
+#     UserKey1 9866235
+
+#     UserKey1 <your_first_random_number_here>
+#     UserKey2 <your_second_random_number_here>
+#     UserKey3 <you_third_random_number_here>
 
 # NoBackupOkay  [DISCOURAGED]
 #     Allows Services to continue file write operations (i.e. database
diff --git a/src/config.c b/src/config.c
index a14e3c300..82bd4904a 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1393,8 +1393,7 @@ int read_config(int reload)
               "Every UserKey must be different. It's for YOUR safety! Remember that!");
         retval = 0;
     }
-    if ((UserKey1 == 9866235) || (UserKey2 == 5216332)
-        || (UserKey3 == 9651291)) {
+    if (UserKey1 == 9866235) {
         error(0,
               "You don't want your network secure? You are supposed to set NEW UserKey values!!!");
         retval = 0;
diff --git a/version.log b/version.log
index 523f8d498..be9cd2ec5 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="8"
-VERSION_BUILD="570"
+VERSION_BUILD="571"
 
 # $Log$
 #
+# BUILD : 1.7.8 (571)
+# BUGS  : 
+# NOTES : Updated userkey infos in example.conf.
+#
 # BUILD : 1.7.8 (570)
 # BUGS  : 294
 # NOTES : Win32 Module Load Errors