summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/protocol/inspircd12.cpp9
-rw-r--r--src/servers.c3
2 files changed, 8 insertions, 4 deletions
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index b63a47df1..20647f997 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -145,7 +145,7 @@ IRCDVar myIrcd[] = {
0, /* Can remove User Channel Modes with SVSMODE */
0, /* Sglines are not enforced until user reconnects */
"x", /* vhost char */
- 0, /* ts6 */
+ 1, /* ts6 */
1, /* support helper umode */
0, /* p10 */
NULL, /* character set */
@@ -1283,11 +1283,12 @@ int AnopeInit(int argc, char **argv)
{
moduleAddAuthor("Anope");
- moduleAddVersion
- ("$Id$");
+ moduleAddVersion("$Id$");
moduleSetType(PROTOCOL);
- pmodule_ircd_version("inspircdIRCd 1.1");
+ TS6SID = sstrdup(Numeric);
+
+ pmodule_ircd_version("InspIRCd 1.1");
pmodule_ircd_cap(myIrcdcap);
pmodule_ircd_var(myIrcd);
pmodule_ircd_cbmodeinfos(myCbmodeinfos);
diff --git a/src/servers.c b/src/servers.c
index 689595d1e..554ec9f67 100644
--- a/src/servers.c
+++ b/src/servers.c
@@ -608,7 +608,10 @@ void ts6_uid_increment(unsigned int slot)
char *ts6_uid_retrieve(void)
{
if (UseTS6 == 0)
+ {
+ alog("TS6 disabled, returning nothing");
return "";
+ }
if (ts6_uid_initted != 1)
ts6_uid_init();