Reflect new organisation structure on QuakeNet

diff --git a/lua/lua.h b/lua/lua.h
index 1a0bdfbf4c556527221d2f954963423d8884dc9d..86dbbaad9bb1f8bdd6a968839b240f5bf572c74e 100644 (file)
--- a/lua/lua.h
+++ b/lua/lua.h
@@ -22,7 +22,7 @@
 
 /*** defines ************************************/
 
-#define LUA_BOTVERSION "1.70"
+#define LUA_BOTVERSION "1.71"
 #define LUA_CHANFIXBOT "Z"
 #define LUA_OPERCHAN "#twilightzone"
 

diff --git a/lua/luabot.c b/lua/luabot.c
index 6fcbd4b9ae1d7950737e3fb6b3e27e548e8b52cb..89524eda130e05a5e3c0200c0aa9986c07abeecb 100644 (file)
--- a/lua/luabot.c
+++ b/lua/luabot.c
@@ -73,7 +73,7 @@ void lua_startbot(void *arg) {
 
   myureconnect = NULL;
 
-  lua_nick = registerlocaluser("U2", "lua", "quakenet.department.of.corrections", LUA_FULLVERSION, "U", UMODE_ACCOUNT | UMODE_DEAF | UMODE_OPER | UMODE_SERVICE, &lua_bothandler);
+  lua_nick = registerlocaluser("U", "lua", "quakenet.department.of.corrections", LUA_FULLVERSION, "U", UMODE_ACCOUNT | UMODE_DEAF | UMODE_OPER | UMODE_SERVICE, &lua_bothandler);
   if(!lua_nick) {
     myureconnect = scheduleoneshot(time(NULL) + 1, &lua_startbot, NULL);
     return;

diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c
index 69679a3fc01e56ecf29723e1b3214e36b0f5bc95..582efa6627b23965ee81e7a35c70af68bc260df2 100644 (file)
--- a/trojanscan/trojanscan.c
+++ b/trojanscan/trojanscan.c
@@ -15,7 +15,7 @@
 #include "../lib/strlfunc.h"
 #include "../lib/version.h"
 
-MODULE_VERSION(TROJANSCAN_VERSION " / $Id: trojanscan.c 694 2006-06-06 19:55:40Z newserv $")
+MODULE_VERSION(TROJANSCAN_VERSION " / $Id: trojanscan.c 741 2007-02-04 16:35:22Z newserv $")
 
 void _init() {
   trojanscan_cmds = newcommandtree();
@@ -214,6 +214,7 @@ void trojanscan_connect(void *arg) {
       localgetops(trojanscan_nick, cp);
   }
 
+#ifdef TROJANSCAN_PEONCHANNEL
   cp = findchannel(TROJANSCAN_PEONCHANNEL);
   if (!cp) {
     localcreatechannel(trojanscan_nick, TROJANSCAN_PEONCHANNEL);
@@ -221,7 +222,8 @@ void trojanscan_connect(void *arg) {
     if(!localjoinchannel(trojanscan_nick, cp))
       localgetops(trojanscan_nick, cp);
   }
-  
+#endif
+
   freesstring(mnick);
   freesstring(myident);
   freesstring(myhost);
@@ -1824,7 +1826,9 @@ void trojanscan_clonehandlemessages(nick *target, int messagetype, void **args)
                   matchbuf[0] = 0;
               
               trojanscan_mainchanmsg("m: t: %c u: %s!%s@%s%s%s w: %s p: %d %s%s", mt, sender->nick, sender->ident, sender->host->name->content, mt=='N'||mt=='M'?" #: ":"", mt=='N'||mt=='M'?chp->index->name->content:"", worm->name->content, trojanscan_database.phrases[i].id, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:"");
-/*              trojanscan_peonchanmsg("m: t: %c u: %s!%s@%s%s%s%s w: %s %s%s", mt, sender->nick, sender->ident, (IsHideHost(sender)&&IsAccount(sender))?sender->authname:sender->host->name->content, (IsHideHost(sender)&&IsAccount(sender))?"."HIS_HIDDENHOST:"", mt=='N'||mt=='M'?" #: ":"", mt=='N'||mt=='M'?chp->index->name->content:"", worm->name->content, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:""); */
+#ifdef TROJANSCAN_PEONCHANNEL
+              trojanscan_peonchanmsg("m: t: %c u: %s!%s@%s%s%s%s w: %s %s%s", mt, sender->nick, sender->ident, (IsHideHost(sender)&&IsAccount(sender))?sender->authname:sender->host->name->content, (IsHideHost(sender)&&IsAccount(sender))?"."HIS_HIDDENHOST:"", mt=='N'||mt=='M'?" #: ":"", mt=='N'||mt=='M'?chp->index->name->content:"", worm->name->content, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:"");
+#endif
             } else {
               int glinetime = TROJANSCAN_FIRST_OFFENSE * frequency * (worm->epidemic?TROJANSCAN_EPIDEMIC_MULTIPLIER:1);
               if(glinetime > 7 * 24)
@@ -2000,6 +2004,7 @@ void trojanscan_mainchanmsg(char *message, ...) {
   sendmessagetochannel(trojanscan_nick, cp, "%s", buf);
 }
 
+#ifdef TROJANSCAN_PEONCHANNEL
 void trojanscan_peonchanmsg(char *message, ...) {
   char buf[513];
   va_list va;
@@ -2016,6 +2021,7 @@ void trojanscan_peonchanmsg(char *message, ...) {
   
   sendmessagetochannel(trojanscan_nick, cp, "%s", buf);
 }
+#endif
 
 int trojanscan_minmaxrand(float min, float max) {
   return (int)((max-min+1)*rand()/(RAND_MAX+min))+min;

diff --git a/trojanscan/trojanscan.h b/trojanscan/trojanscan.h
index 985687c1f24a91c96627c05846396f1f62f2524b..b2a736e538c2f1767798df5bd29cf5167a226101 100644 (file)
--- a/trojanscan/trojanscan.h
+++ b/trojanscan/trojanscan.h
@@ -18,7 +18,7 @@
 #include <ctype.h>
 #include <strings.h>
 
-#define TROJANSCAN_VERSION "2.63"
+#define TROJANSCAN_VERSION "2.64"
 
 #define TROJANSCAN_MAX_HOST_GLINE   5
 
@@ -55,9 +55,8 @@
 
 #define TROJANSCAN_CAT "./trojanscan/cat.txt"
 
-#define TROJANSCAN_CHANNEL "#qnet.sec.trj"
+#define TROJANSCAN_CHANNEL "#qnet.trj"
 #define TROJANSCAN_OPERCHANNEL "#twilightzone"
-#define TROJANSCAN_PEONCHANNEL "#qnet.trj"
 
 #define TROJANSCAN_URL_PREFIX "http://trojanscan.quakenet.org/?"