Conf files updates, makenet change.

diff --git a/Changes b/Changes
index 22c8b119d3ca5de7007588f9f4c0b162c1430b75..ccf976f71bc4e48a9d4c1f755ce47e475e80d093 100644 (file)
--- a/Changes
+++ b/Changes
@@ -364,3 +364,15 @@ when umode +j (JUNK). Also, went through channel.c
 and made all snotices look "nicer"
 --Luke
 ===================================
+
+Moved cloak keys to unrealircd.conf, since the
+.network files are public domain (in general).
+Go lynch Stskeeps if you don't like it.
+--Luke
+===================================
+
+Actually added sample lines to unrealircd.conf
+for EXEMPT_ALL and CLOAK_KEY_n. Also, changed
+version number on both that and the .network
+file, as both have changed since 3.1.3.
+--Luke

diff --git a/include/dynconf.h b/include/dynconf.h
index 3ac3f118d52c94ba713fe185d44051773a923862..55916d91983dbf71c7e3a02e0e29a1aa0a197b4a 100644 (file)
--- a/include/dynconf.h
+++ b/include/dynconf.h
@@ -23,8 +23,8 @@
 #define DYNCONF_H
 
 /* config level */
-#define DYNCONF_CONF_VERSION "1.5"
-#define DYNCONF_NETWORK_VERSION "2.2"
+#define DYNCONF_CONF_VERSION "1.6"
+#define DYNCONF_NETWORK_VERSION "2.3"
 
 typedef struct zNetwork aNetwork;
 struct zNetwork {

diff --git a/networks/makenet b/networks/makenet
index 765a01337e9b6cf320d49498bc1b934c49a12231..d22e0d4caa49951fda2dd65df694517f873666df 100755 (executable)
--- a/networks/makenet
+++ b/networks/makenet
@@ -7,7 +7,7 @@
 #
 # (c) 2000 codemastr (Dominick Meglio) and the UnrealIRCd Team
 
-VERSION="2.2"
+VERSION="2.3"
 DATE=`date "+%d %B %Y %H:%M"`
 FILE="mynet.network"
 EXISTS="y"
@@ -27,9 +27,6 @@ NETDOMAIN="mynet.org"
 HELPCHAN="#help"
 STATS_SERVER="stats.mynet.org"
 INAH="1"
-CKEY_1="0"
-CKEY_2="0"
-CKEY_3="0"
 SUBMIT="y"
 
 # Checking out how to specify not to make a new line with the current OS
@@ -207,29 +204,6 @@ if [ ! -z $cc ]; then
        INAH="$cc"
 fi
 
-echo ""
-echo "*** IMPORTANT AND NEW! ***"
-echo "What is your network's first cloak key?"
-echo $n "[$CKEY_1] -> $c"
-read cc
-if [ ! -z $cc ]; then
-       CKEY_1="$cc"
-fi
-
-echo "What is your network's second cloak key?"
-echo $n "[$CKEY_2] -> $c"
-read cc
-if [ ! -z $cc ]; then
-       CKEY_2="$cc"
-fi
-
-echo "What is your network's third cloak key?"
-echo $n "[$CKEY_3] -> $c"
-read cc
-if [ ! -z $cc ]; then
-       CKEY_3="$cc"
-fi
-
 # write the actual conf
 
 cat > $FILE << __EOF__
@@ -260,9 +234,6 @@ Set STATS_SERVER ..: $STATS_SERVER
 Set HUB ...........: not_in_use
 Set iNAH ..........: $INAH
 Set net_quit ......: not_in_use
-Set cloak_key_1 ...: $CKEY_1
-Set cloak_key_2 ...: $CKEY_2
-Set cloak_key_3 ...: $CKEY_3
 __EOF__
 
 echo ""

diff --git a/networks/template.network b/networks/template.network
index a72c0570c199fef987ecb997cad327cc6b7c0225..4034906ce38dff1515b423c216a37cbf6dae272f 100644 (file)
--- a/networks/template.network
+++ b/networks/template.network
@@ -1,4 +1,4 @@
-ver^2.2
+ver^2.3
 #
 # Network Configuration File Template
 # -----------------------------------------
@@ -65,11 +65,3 @@ Set HUB ...........: 1
 Set iNAH ..........: 0
 # -- Not in use but still here --
 Set net_quit ......: ic
-
-
-# These are the cloak keys for your network. They should be the same on ALL SERVERS
-# They must also be > 10000
-Set cloak_key_1 ...: 0
-Set cloak_key_2 ...: 0
-Set cloak_key_3 ...: 0
-

diff --git a/networks/unrealircd.conf b/networks/unrealircd.conf
index 6c2f6b378d38eadb2b1e205c63a1b207f686516c..12bc825c79291a28d029d449dcf410c8011fc557 100644 (file)
--- a/networks/unrealircd.conf
+++ b/networks/unrealircd.conf
@@ -1,4 +1,4 @@
-ver^1.5
+ver^1.6
 #
 #   UnrealIRCd Configuration file - unrealircd.conf
 #   (C) Carsten Munk 1999 - Under the GNU license
@@ -127,3 +127,18 @@ Set HOST_TIMEOUT ........: 2
 # that should be send when no DNS response is received
 #
 Set HOST_RETRIES ........: 2
+
+#
+# This allows exempt lines in ircd.conf to match glines
+# and akills instead of just local klines. [NEW]
+#
+Set EXEMPT_ALL ..........: 1
+
+#
+# These three cloak keys SHOULD BE THE SAME ON ALL SERVERS.
+# They are part of the algorithm that cloaks hosts for users
+# that are +x.
+#
+Set CLOAK_KEY_1 .........: 0
+Set CLOAK_KEY_2 .........: 0
+Set CLOAK_KEY_3 .........: 0

diff --git a/src/dynconf.c b/src/dynconf.c
index ab749818b4ebf2b8658075e701bb29bfa716b65a..d95dfaeb6e45b0913338c2fcce2f27d4b921d47c 100644 (file)
--- a/src/dynconf.c
+++ b/src/dynconf.c
@@ -391,6 +391,18 @@ int  load_conf2(FILE * conf, char *filename, int type)
                        {
                                EXEMPT_ALL = atoi(setto);
                        }
+                       else if (strcmp(var, "CLOAK_KEY_1") == 0)
+                       {
+                               CLOAK_KEY1 = ircabs(atol(setto));
+                       }
+                       else if (strcmp(var, "CLOAK_KEY_2") == 0)
+                       {
+                               CLOAK_KEY2 = ircabs(atol(setto));
+                       }
+                       else if (strcmp(var, "CLOAK_KEY_3") == 0)
+                       {
+                               CLOAK_KEY3 = ircabs(atol(setto));
+                       }
 #ifndef BIG_SECURITY_HOLE
                        else if (strcmp(var, "SETUID") == 0)
                        {
@@ -506,12 +518,6 @@ int  load_conf3(FILE * conf, char *filename, int type)
                        {
                                AllocCpy(helpchan, setto);
                        }
-                        else if (strcmp(var, "cloak_key_1") == 0)
-                                CLOAK_KEY1 = ircabs(atol(setto));
-                        else if (strcmp(var, "cloak_key_2") == 0)
-                                CLOAK_KEY2 = ircabs(atol(setto));
-                        else if (strcmp(var, "cloak_key_3") == 0)
-                                CLOAK_KEY3 = ircabs(atol(setto));
                        else if (strcmp(var, "STATS_SERVER") == 0)
                        {
                                AllocCpy(STATS_SERVER, setto);
@@ -562,6 +568,8 @@ void doneconf(int type)
                strcat(errormsg, "- EXEMPT_ALL is an invalid value\n");
        if (HOST_RETRIES < 0 || HOST_RETRIES > 10)
                strcat(errormsg, "- HOST_RETRIES is an invalid value\n");
+        if ((CLOAK_KEY1 < 10000) || (CLOAK_KEY2 < 10000) || (CLOAK_KEY3 < 10000))
+                strcat(errormsg, "- Missing cloak keys, or they're too easy to guess. Make them > 10000\n");
 #define Missing(x) !(x) || (*(x) == '\0')
        if (Missing(defserv))
                strcat(errormsg, "- Missing defserv field\n");
@@ -585,8 +593,6 @@ void doneconf(int type)
                strcat(errormsg, "- Missing netdomain field\n");
        if (Missing(helpchan))
                strcat(errormsg, "- Missing helpchan field\n");
-       if ((CLOAK_KEY1 < 10000) || (CLOAK_KEY2 < 10000) || (CLOAK_KEY3 < 10000))
-               strcat(errormsg, "- Missing cloak keys, or they're too easy to guess. Make them > 10000\n");
        if (Missing(STATS_SERVER))
                strcat(errormsg, "- Missing STATS_SERVER field\n");
        if (Missing(iConf.socksbanmessage))