BUILD : 1.7.4 (230) BUGS : 97 NOTES : Fixed the need of hybrid to have Global in LogChan on startup

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


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

3 files changed, 15 insertions, 6 deletions

diff --git a/Changes b/Changes
index 186ece666..e9bce0a1b 100644
--- a/Changes
+++ b/Changes
@@ -1,8 +1,9 @@
 Anope Version S V N
 -------------------
 Provided by Anope Dev. <dev@anope.org> - 2004
-07/05 A Warning when LocalAddress conflicts with RemoteServer             [#118]
+07/05 A Warning when LocalAddress conflicts with RemoteServer.            [#118]
 06/18 A Added proper Bahamut1.8 support.                                  [ #55]
+07/05 F Global now joins LogChan on startup with hybrid.                  [ #97]
 07/04 F Fixed a bug with m_time.                                          [ #00]
 06/30 F Fixed bug which caused failure in anope crontab script.           [ #00]
 06/28 F Fixed compiling bug with UltimateIRCd3, ViagraIRCd, Rage2IRCd.    [ #00]
diff --git a/init.c b/init.c
index 53a0b21ef..c6daf5918 100644
--- a/init.c
+++ b/init.c
@@ -382,10 +382,6 @@ static int parse_options(int ac, char **av)
                 nofork = 1;
             } else if (strcmp(s, "logchan") == 0) {
                 logchan = 1;
-#ifdef IRC_HYBRID
-                fprintf(stderr,
-                        "LogChan will only work if your logchannel is not set to +n\n");
-#endif
             } else if (strcmp(s, "forceload") == 0) {
                 forceload = 1;
             } else if (!strcmp(s, "noexpire")) {
@@ -826,6 +822,14 @@ int init(int ac, char **av)
     /* Bring in our pseudo-clients */
     introduce_user(NULL);
 
+    /* And hybrid needs Global joined in the logchan */
+#ifdef IRC_HYBRID
+    if (logchan) {
+        send_cmd(NULL, "SJOIN %ld %s + :%s", time(NULL), LogChannel,
+                 s_GlobalNoticer);
+    }
+#endif
+
     /**
       * Load our delayed modeles - modules that are planing on making clients need to wait till now
       * where as modules wanting to modify our ircd connection messages need to load eariler :|
diff --git a/version.log b/version.log
index b3e0ff9f2..bac048a26 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="4"
-VERSION_BUILD="229"
+VERSION_BUILD="230"
 
 # $Log$
 #
+# BUILD : 1.7.4 (230)
+# BUGS  : 97
+# NOTES : Fixed the need of hybrid to have Global in LogChan on startup
+#
 # BUILD : 1.7.4 (229)
 # BUGS  : 118
 # NOTES : Added warning for a config conflict between LocalAddress and RemoteServer