Remove UseTS6. This is now on or off at an ircd, not a config level. Move Chary to obsolete for now, it's identical to ratbox anyway in most regards, and it's getting annoying having to redo the same work twice..

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

1 files changed, 11 insertions, 9 deletions

diff --git a/src/modules.c b/src/modules.c
index 7120d5c4e..34025a9af 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -90,15 +90,17 @@ int protocol_module_init(void)
 		 * as we only have the ircd struct filled here, we have to over
 		 * here. -GD
 		 */
-		if (UseTS6 && !(ircd->ts6)) {
-			alog("Chosen IRCd does not support TS6, unsetting UseTS6");
-			UseTS6 = 0;
-		}
-
-		/* We can assume the ircd supports TS6 here */
-		if (UseTS6 && !Numeric) {
-			alog("UseTS6 requires the setting of Numeric to be enabled.");
-			ret = -1;
+		if (ircd->ts6)
+		{
+			if (!Numeric)
+			{
+				alog("This IRCd protocol requires a server numeric to be set in Anope's configuration.");
+				ret = -1;
+			}
+			else
+			{
+				ts6_uid_init();
+			}
 		}
 	}