summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--Changes.conf14
-rw-r--r--data/example.conf20
-rw-r--r--src/config.c9
-rw-r--r--version.log6
5 files changed, 32 insertions, 18 deletions
diff --git a/Changes b/Changes
index 9a55c7de3..3e9f97108 100644
--- a/Changes
+++ b/Changes
@@ -7,6 +7,7 @@ Provided by Anope Dev. <dev@anope.org> - 2005
07/01 A Events for channel access/xop updates. [ #00]
06/26 A New module pack module: hs_request. [ #00]
06/03 A Protocol files can now fill mod_current_buffer with custom code. [#389]
+08/30 F Changed UserKeys to RECOMMENDED instead of REQUIRED. [ #00]
08/29 F Pseudo-clients can now part with no instead of an empty reason. [ #00]
08/29 F Memory leak when using mysql to save data. [ #00]
08/29 F Organised docs/FAQ a bit more and slightly restyled it. [ #00]
diff --git a/Changes.conf b/Changes.conf
index c3c23f3a2..db8d7905b 100644
--- a/Changes.conf
+++ b/Changes.conf
@@ -3,6 +3,20 @@ Anope Version S V N
** ADDED CONFIGURATION DIRECTIVES **
** MODIFIED CONFIGURATION DIRECTIVES **
+# UserKey1|2|3 <value> [RECOMMENDED]
+#
+# 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 anyone! Keep them private!
+#
+# *** NOTE ***
+# If you don't enable these, or keep their default values, any talented
+# programmer would be able to easily "guess" random strings used to mask
+# information. Be safe, and come up with three different 7 digit numbers
+
+#UserKey1 9866235
+#UserKey2 8362013
+#UserKey3 2362899
** DELETED CONFIGURATION DIRECTIVES **
diff --git a/data/example.conf b/data/example.conf
index 6f6c27f9d..1163cc34c 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -327,20 +327,20 @@ NetworkName "LocalNet"
#
###########################################################################
-# UserKey1|2|3 <value> [REQUIRED]
+# UserKey1|2|3 <value> [RECOMMENDED]
#
# 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 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 or you forgot to remove
-# the # in front of them. Example:
-# UserKey1 9866235
-
-# UserKey1 <your_first_random_number_here>
-# UserKey2 <your_second_random_number_here>
-# UserKey3 <you_third_random_number_here>
+#
+# *** NOTE ***
+# If you don't enable these, or keep their default values, any talented
+# programmer would be able to easily "guess" random strings used to mask
+# information. Be safe, and come up with three different 7 digit numbers
+
+#UserKey1 9866235
+#UserKey2 8362013
+#UserKey3 2362899
# NoBackupOkay [DISCOURAGED]
# Allows Services to continue file write operations (i.e. database
diff --git a/src/config.c b/src/config.c
index 362751cea..3abdc46bd 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1347,18 +1347,13 @@ int read_config(int reload)
}
/* Check the user keys */
- CHECK(UserKey1);
- CHECK(UserKey2);
- CHECK(UserKey3);
if ((UserKey1 == UserKey2) || (UserKey1 == UserKey3)
|| (UserKey3 == UserKey2)) {
- error(0,
- "Every UserKey must be different. It's for YOUR safety! Remember that!");
+ alog("Every UserKey must be different. It's for YOUR safety! Remember that!");
retval = 0;
}
if (UserKey1 == 9866235) {
- error(0,
- "You don't want your network secure? You are supposed to set NEW UserKey values!!!");
+ alog("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 5a0aea4e5..89235d7d6 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="10"
-VERSION_BUILD="862"
+VERSION_BUILD="864"
# $Log$
#
+# BUILD : 1.7.10 (864)
+# BUGS :
+# NOTES : Changed UserKeys from REQUIRED to RECOMMENDED
+#
# BUILD : 1.7.10 (862)
# BUGS :
# NOTES : Fixed anope_cmd_part passing on "\0" instead of NULL when given NULL-arg