From 9e136a5c2f0da111ef873b9eaa1ebccebd1f1eb2 Mon Sep 17 00:00:00 2001
From: "geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b"
 <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Fri, 4 Aug 2006 09:16:34 +0000
Subject: [PATCH] BUILD : 1.7.14 (1107) BUGS : 561 NOTES : Various small fixes
 for charybdis

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


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@831 5417fbe8-f217-4b02-8779-1006273d7864
---
 Changes                  |  1 +
 src/main.c               |  2 +-
 src/protocol/charybdis.c | 17 ++++++++++++-----
 version.log              |  6 +++++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Changes b/Changes
index b2003f4de..d6f3235c6 100644
--- a/Changes
+++ b/Changes
@@ -51,6 +51,7 @@ Provided by Anope Dev. <dev@anope.org> - 2006
 07/20 F db-merger.c and epona2anope.c will now properly delete old dbs.   [ #00]
 08/02 F Fixed very nasty typecast. GCC Hardened should now work.          [#557]
 08/03 F Corrected usermodes for ratbox and shadow.                        [#558]
+08/04 F Various small fixes for Charybdis.                                [#561]
 
 Provided by ThaPrince <jon@vile.com> - 2006
 05/19 A Plexus 3 support.                                                 [ #00]
diff --git a/src/main.c b/src/main.c
index aee7a0520..dca9011d9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -602,7 +602,7 @@ int main(int ac, char **av, char **envp)
            socket stuff -Certus */
         i = (int) (long) sgets2(inbuf, sizeof(inbuf), servsock);
         waiting = 0;
-        if ((i>0) || (i<(-1))) {
+        if ((i > 0) || (i < (-1))) {
             process();
         } else if (i == 0) {
             int errno_save = errno;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 4d879a3a0..3e210797e 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1803,8 +1803,8 @@ int charybdis_send_account(int argc, char **argv)
     return MOD_CONT;
 }
 
-#if 0
 /* XXX: We need a hook on /ns logout before this is useful! --nenolod */
+/* We have one now! -GD */
 int charybdis_send_deaccount(int argc, char **argv)
 {
     send_cmd((UseTS6 ? TS6SID : ServerName), "ENCAP * SU %s",
@@ -1812,7 +1812,6 @@ int charybdis_send_deaccount(int argc, char **argv)
 
     return MOD_CONT;
 }
-#endif
 
 /**
  * Tell anope which function we want to perform each task inside of anope.
@@ -1914,7 +1913,7 @@ int AnopeInit(int argc, char **argv)
     pmodule_ircd_cbmodes(myCbmodes);
     pmodule_ircd_cmmodes(myCmmodes);
     pmodule_ircd_csmodes(myCsmodes);
-    pmodule_ircd_useTSMode(0);
+    pmodule_ircd_useTSMode(1);
 
         /** Deal with modes anope _needs_ to know **/
     pmodule_invis_umode(UMODE_i);
@@ -1934,11 +1933,19 @@ int AnopeInit(int argc, char **argv)
     hk = createEventHook(EVENT_NICK_REGISTERED, charybdis_send_account);
     moduleAddEventHook(hk);
 
-#if 0
     /* XXX: It'd be nice if we could have an event like this, but it's not there yet :( */
+	/* It's there now! Trystan said so! -GD */
     hk = createEventHook(EVENT_NICK_LOGOUT, charybdis_send_deaccount);
     moduleAddEventHook(hk);
-#endif
 
     return MOD_CONT;
 }
+
+/* Clean up allocated things in here */
+void AnopeFini(void)
+{
+	if (UseTS6)
+		free(TS6SID);
+}
+
+/* EOF */
diff --git a/version.log b/version.log
index b68f56dbc..7559c64ee 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="14"
 VERSION_EXTRA=""
-VERSION_BUILD="1106"
+VERSION_BUILD="1107"
 
 # $Log$
 #
+# BUILD : 1.7.14 (1107)
+# BUGS  : 561
+# NOTES : Various small fixes for charybdis
+#
 # BUILD : 1.7.14 (1106)
 # BUGS  :
 # NOTES : applied heinz's fix for the gcc hardened issue