BUILD : 1.7.15 (1163) BUGS : NOTES : Various small changes to documentation and example config (and removing void \r from sources)

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


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

7 files changed, 44 insertions, 29 deletions

diff --git a/data/example.conf b/data/example.conf
index 0572642e1..6c6edb727 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -477,6 +477,9 @@ ForceForbidReason
 #    addressed to Nick@ServerName - e.g. NickServ@localhost.net.
 #    This should be used on conjunction with ircd aliases.
 #
+#    When using Bahamut, this option will NOT work if the uplink server is
+#    configured as a services hub. The serviceshub option is not designed to
+#    be used with Anope.
 
 #UseStrictPrivMsg
 
diff --git a/docs/NEWS b/docs/NEWS
index 19ace0655..c675213f5 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -25,15 +25,18 @@ Highlighted News in Anope 1.7 (and soon 1.8)
     - DreamForge 4.6.7
     - Bahamut 1.4.27 or later (including 1.8)
     - UnrealIRCd 3.1.1 or later (including 3.2)
-    - UltimateIRCd 2.8.2 or later (including 3.0.0)
+    - UltimateIRCd 2.8.2 or later (including 3.0)
     - Hybrid 7 or later
     - ViagraIRCd 1.3 or later
     - PTlink 6.15 or later
     - RageIRCd 2.0 beta-6 or later
     - Solid IRCd 3.4.6 or later
-    - Plexus 2.0 or later
+    - Plexus 2.0 or later (including 3.0)
     - Ratbox 2.0.6 or later
     - ShadowIRCd 4.0 beta 7 or later
+	- Charybdis 1.0 or later
+	- InspIRCd 1.0 or later
+	- RageIRCd 2.0 or later
   * Added new languages. Currently included:
       Catalan, German, English, Spanish, French, Greek,
       Hungarian, Italian, Dutch, Polish, Portugese,
diff --git a/docs/README b/docs/README
index 76fdffcc7..004ab638b 100644
--- a/docs/README
+++ b/docs/README
@@ -156,13 +156,14 @@ Table of Contents
         * Charybdis 1.0 or later
         * DreamForge 4.6.7
         * Hybrid 7 or later
+		* InspIRCd 1.0 or later
         * Plexus 2.0 or later (including 3.0)
         * PTlink 6.15 or later
         * RageIRCd 2.0 beta-6 or later
         * Ratbox 2.0.6 or later
         * ShadowIRCd 4.0 beta 7 or later
         * Solid IRCd 3.4.6 or later
-        * UltimateIRCd 2.8.2 or later (including 3.0.0)
+        * UltimateIRCd 2.8.2 or later (including 3.0)
         * UnrealIRCd 3.1.1 or later (including 3.2)
         * ViagraIRCd 1.3 or later
 
@@ -214,6 +215,10 @@ Table of Contents
         -noexpire       Expiration routines won't be run at all
         -logchan        Startup with logchan enabled
         -version        Display the version of Anope
+		-nothird        Do not load the modules specified in ModulesAutoload
+		                    or ModulesDelayedAutoload in the config file
+		-protocoldebug  Debug each incoming message after protocol parsing
+		-support        Used for support, same as -debug -nofork -nothird
 
     Upon starting, Anope will parse its command-line parameters, open its
     logfile, then (assuming the -nofork option is not given) detach itself
diff --git a/src/init.c b/src/init.c
index b8ae80903..6f78e018c 100644
--- a/src/init.c
+++ b/src/init.c
@@ -328,7 +328,7 @@ static int parse_options(int ac, char **av)
             } else if (strcmp(s, "nothird") == 0) {
                 nothird = 1;
             } else if (strcmp(s, "protocoldebug") == 0) {
-                
protocoldebug = 1;
+                protocoldebug = 1;
             } else if (strcmp(s, "support") == 0) {
                 nofork = 1;
                 debug++;
diff --git a/src/misc.c b/src/misc.c
index 68db04148..cf684870c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -751,26 +751,26 @@ char *myStrSubString(const char *src, int start, int end)
 
 /*************************************************************************/
 
-void protocol_debug(char *source, char *cmd, int argc, char **argv)

-{

-    int i;

-

-    if (protocoldebug) {

-        if (source)

-            alog("debug: Source %s", source);

-        if (cmd)

-            alog("debug: Token %s", cmd);

-        if (argc) {

-            for (i = 0; i < argc; i++) {

-                alog("debug: av[%d] = %s", i, argv[i]);

-            }

-        } else {

-            alog("debug: av[0] = NULL");

-        }

-    }

-    return;

-}

-

+void protocol_debug(char *source, char *cmd, int argc, char **argv)
+{
+    int i;
+
+    if (protocoldebug) {
+        if (source)
+            alog("debug: Source %s", source);
+        if (cmd)
+            alog("debug: Token %s", cmd);
+        if (argc) {
+            for (i = 0; i < argc; i++) {
+                alog("debug: av[%d] = %s", i, argv[i]);
+            }
+        } else {
+            alog("debug: av[0] = NULL");
+        }
+    }
+    return;
+}
+
 /*************************************************************************/
 
 /**
diff --git a/src/process.c b/src/process.c
index a89804992..2834d0794 100644
--- a/src/process.c
+++ b/src/process.c
@@ -232,10 +232,10 @@ void process()
         s = buf + strlen(buf);
     strscpy(cmd, buf, sizeof(cmd));
     ac = split_buf(s, &av, 1);
-    
if (protocoldebug) {
-        
protocol_debug(source, cmd, ac, av);
-    
}
-    
if (mod_current_buffer) {
+    if (protocoldebug) {
+        protocol_debug(source, cmd, ac, av);
+    }
+    if (mod_current_buffer) {
         free(mod_current_buffer);
     }
     /* fix to moduleGetLastBuffer() bug 296 */
diff --git a/version.log b/version.log
index cf6e22336..24713cff5 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="15"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1162"
+VERSION_BUILD="1163"
 
 # $Log$
 #
+# BUILD : 1.7.15 (1163)
+# BUGS  : 
+# NOTES : Various small changes to documentation and example config (and removing void \r from sources)
+#
 # BUILD : 1.7.15 (1162)
 # BUGS  : 604
 # NOTES : Added functions to let modules backup their own databases and added this functionality to the bundled modules