Merge.

diff --git a/lua/luacommands.c b/lua/luacommands.c
index 2c297603d1077bdda8501ed059cb9f10df361e44..ddb7a49c699f183176b3f7fe477f1235b9f61287 100644 (file)
--- a/lua/luacommands.c
+++ b/lua/luacommands.c
@@ -261,7 +261,7 @@ static int lua_gline(lua_State *ps) {
     snprintf(mask, sizeof(mask), "*@%s", IPtostr(target->p_ipaddr));
   }
 
-  irc_send("%s GL * +%s %d :%s", mynumeric->content, mask, duration, reason);
+  irc_send("%s GL * +%s %d %jd :%s", mynumeric->content, mask, duration, (intmax_t)time(NULL), reason);
   LUA_RETURN(ps, lua_cmsg(LUA_PUKECHAN, "lua-GLINE: %s (%d users, %d seconds -- %s)", mask, usercount, duration, reason));
 }
 

diff --git a/regexgline/regexgline.c b/regexgline/regexgline.c
index db4bbbb39c1a366f910683cf7a55195156d1c062..3ae6a69a839d6df999911df556dfdf6cf8464589 100644 (file)
--- a/regexgline/regexgline.c
+++ b/regexgline/regexgline.c
@@ -147,6 +147,12 @@ void _fini(void) {
   }
 }
 
+static int ignorable_nick(nick *np) {
+  if(IsOper(np) || IsService(np) || IsXOper(np) || SIsService(&serverlist[homeserver(np->numeric)]))
+    return 1;
+  return 0;
+}
+
 void rg_checkexpiry(void *arg) {
   struct rg_struct *rp = rg_list, *lp = NULL;
   time_t current = time(NULL);
@@ -413,7 +419,7 @@ void rg_nick(int hooknum, void *arg) {
 
   hostlen = RGBuildHostname(hostname, np);
 
-  if(IsOper(np) || IsService(np) || IsXOper(np))
+  if(ignorable_nick(np))
     return;
 
   for(rp=rg_list;rp;rp=rp->next) {
@@ -505,7 +511,7 @@ int rg_gline(void *source, int cargc, char **cargv) {
 
   for(j=0;j<NICKHASHSIZE;j++) {
     for(tnp=nicktable[j];tnp;tnp=tnp->next) {
-      if(IsOper(tnp) || IsService(tnp) || IsXOper(tnp))
+      if(ignorable_nick(tnp))
         continue;
 
       hostlen = RGBuildHostname(hostname, tnp);
@@ -883,7 +889,7 @@ void rg_startup(void) {
 
   for(j=0;j<NICKHASHSIZE;j++) {
     for(np=nicktable[j];np;np=np->next) {
-      if(IsOper(np) || IsService(np) || IsXOper(np))
+      if(ignorable_nick(np))
         continue;
       hostlen = RGBuildHostname(hostname, np);
       for(rp=rg_list;rp;rp=rp->next) {

diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c
index a5cf677323a244af83fd3ee1d0c9ea84f596e2a3..971f79c4610a0341c1269ff1e57f92e44cbf3565 100644 (file)
--- a/trojanscan/trojanscan.c
+++ b/trojanscan/trojanscan.c
@@ -216,12 +216,12 @@ void trojanscan_connect(void *arg) {
   trojanscan_database.glines = 0;
   trojanscan_database.detections = 0;
     
-  dbhost = getcopyconfigitem("trojanscan", "dbhost", "localhost", HOSTLEN);
-  dbuser = getcopyconfigitem("trojanscan", "dbuser", "", NICKLEN);
-  dbpass = getcopyconfigitem("trojanscan", "dbpass", "", REALLEN);
-  db = getcopyconfigitem("trojanscan", "db", "", NICKLEN);
+  dbhost = getcopyconfigitem("trojanscan", "dbhost", "localhost", 100);
+  dbuser = getcopyconfigitem("trojanscan", "dbuser", "moo", 100);
+  dbpass = getcopyconfigitem("trojanscan", "dbpass", "changeme", 100);
+  db = getcopyconfigitem("trojanscan", "db", "moo", 100);
   
-  dbport = getcopyconfigitem("trojanscan", "dbport", "3306", ACCOUNTLEN);
+  dbport = getcopyconfigitem("trojanscan", "dbport", "3306", 10);
   
   length = snprintf(buf, sizeof(buf) - 1, "%d", TROJANSCAN_DEFAULT_MAXCHANS);
   temp = getcopyconfigitem("trojanscan", "maxchans", buf, length);