Applied fixes for eggdrop1.6.15 from eggdrop cvs

svn: 69

doc/UPDATES

@@ -20,6 +20,7 @@
 + 9.Specifying ipv6 ip as last param in conf now supported.
 @ 10.Cmdline params -e/-d now except STDOUT as the outfile (echos to terminal).
 @ 11.Pscloak can be disabled by putting "!-" as the third line in the local conf.
+@ 12.Applied fixes for eggdrop1.6.15 from eggcvs.
 
 1.0.1
 ! 1.Fixed a cosmetic bug in show_channels

src/mem.c

@@ -325,7 +325,7 @@ void *n_realloc(void *ptr, int size, const char *file, int line)
     return n_malloc(size, file, line);
 
   x = (void *) realloc(ptr, size);
-  if (x == NULL) {
+  if (x == NULL && size > 0) {
     i = i;
     putlog(LOG_MISC, "*", "*** FAILED REALLOC %s (%d)", file, line);
     return NULL;

src/misc.c

@@ -1027,7 +1027,6 @@ void putlog EGG_VARARGS_DEF(int, arg1)
   time_t now2 = time(NULL);
 #endif
   struct tm *t;
-  t = 0;
   type = EGG_VARARGS_START(int, arg1, va);
   chname = va_arg(va, char *);
   format = va_arg(va, char *);
@@ -1035,8 +1034,8 @@ void putlog EGG_VARARGS_DEF(int, arg1)
   if ((chname[0] == '*'))
     dohl = 1;
 #ifdef HUB
+  t = localtime(&now2);
   if (shtime) {
-    t = localtime(&now2);
     egg_strftime(stamp, sizeof(stamp) - 2, LOG_TS, t);
     strcat(stamp, " ");
    tsl = strlen(stamp);

src/mod/channels.mod/cmdschan.c

@@ -420,7 +420,8 @@ static void cmd_mns_ban(struct userrec *u, int idx, char *par)
     if (!chname)
       chname = dcc[idx].u.chat->con_chan;
     get_user_flagrec(u, &user, chname);
-    if (!((glob_op(user) && !chan_deop(user)) || chan_op(user))) {
+
+    if ((!chan_op(user) && (!glob_op(user) || chan_deop(user)))) {
       dprintf(idx, "You don't have access to remove bans on %s.\n", chname);
       return;
     }
@@ -432,7 +433,7 @@ static void cmd_mns_ban(struct userrec *u, int idx, char *par)
       if (lastdeletedmask)
         mask = lastdeletedmask;
       else
-       mask = s;
+        mask = s;
       putlog(LOG_CMDS, "*", "#%s# -ban %s", dcc[idx].nick, mask);
       dprintf(idx, "%s: %s\n", IRC_REMOVEDBAN, mask);
       for (chan = chanset; chan != NULL; chan = chan->next)
@@ -448,18 +449,23 @@ static void cmd_mns_ban(struct userrec *u, int idx, char *par)
     return;
   }
   if ((i = atoi(ban)) > 0) {
+    /* substract the numer of global bans to get the number of the channel ban */
     egg_snprintf(s, sizeof s, "%d", i);
-    j = u_delban(chan, s, 1);
-    if (j > 0) {
-      if (lastdeletedmask)
-        mask = lastdeletedmask;
-      else
-       mask = s;
-      putlog(LOG_CMDS, "*", "#%s# (%s) -ban %s", dcc[idx].nick, chan->dname,
-             mask);
-      dprintf(idx, "Removed %s channel ban: %s\n", chan->dname, mask);
-      add_mode(chan, '-', 'b', mask);
-      return;
+    j = u_delban(0, s, 0);
+    if (j < 0) {
+      egg_snprintf(s, sizeof s, "%d", -j);
+      j = u_delban(chan, s, 1);
+      if (j > 0) {
+        if (lastdeletedmask)
+          mask = lastdeletedmask;
+        else
+          mask = s;
+        putlog(LOG_CMDS, "*", "#%s# (%s) -ban %s", dcc[idx].nick, chan->dname,
+               mask);
+        dprintf(idx, "Removed %s channel ban: %s\n", chan->dname, mask);
+        add_mode(chan, '-', 'b', mask);
+        return;
+      }
     }
     i = 0;
     for (b = chan->channel.ban; b && b->mask && b->mask[0]; b = b->next) {
@@ -488,8 +494,7 @@ static void cmd_mns_ban(struct userrec *u, int idx, char *par)
     for (b = chan->channel.ban; b && b->mask && b->mask[0]; b = b->next) {
       if (!rfc_casecmp(b->mask, ban)) {
         add_mode(chan, '-', 'b', b->mask);
-        dprintf(idx, "%s '%s' on %s.\n",
-                IRC_REMOVEDBAN, b->mask, chan->dname);
+        dprintf(idx, "%s '%s' on %s.\n", IRC_REMOVEDBAN, b->mask, chan->dname);
         putlog(LOG_CMDS, "*", "#%s# (%s) -ban %s [on channel]",
                dcc[idx].nick, dcc[idx].u.chat->con_chan, ban);
         return;
@@ -498,12 +503,13 @@ static void cmd_mns_ban(struct userrec *u, int idx, char *par)
   }
   dprintf(idx, "No such ban.\n");
 }
+
 #ifdef S_IRCNET
 static void cmd_mns_exempt (struct userrec *u, int idx, char *par)
 {
-  int i = 0, j;
+  int console = 0, i = 0, j;
   struct chanset_t *chan = NULL;
-  char s[UHOSTLEN], *exempt, *chname;
+  char s[UHOSTLEN], *exempt, *chname, *mask;
   masklist *e;
 
   if (!use_exempts) {
@@ -517,84 +523,104 @@ static void cmd_mns_exempt (struct userrec *u, int idx, char *par)
   exempt = newsplit(&par);
   if (par[0] && strchr(CHANMETA, par[0]))
     chname = newsplit(&par);
-  else
+  else {
     chname = dcc[idx].u.chat->con_chan;
+    console = 1;
+  }
   if (chname || !(u->flags & USER_MASTER)) {
     if (!chname)
       chname = dcc[idx].u.chat->con_chan;
-    get_user_flagrec(u,&user,chname);
-    if (!((glob_op(user) && !chan_deop(user)) || chan_op(user))) {
+    get_user_flagrec(u, &user, chname);
+    if ((!chan_op(user) && (!glob_op(user) || chan_deop(user)))) {
       dprintf(idx, "You don't have access to remove exempts on %s.\n", chname);
       return;
     }
   }
   strncpyz(s, exempt, sizeof s);
-  i = u_delexempt(NULL, s, (u->flags & USER_MASTER));
-  if (i > 0) {
-    putlog(LOG_CMDS, "*", "#%s# -exempt %s", dcc[idx].nick, s);
-    dprintf(idx, "%s: %s\n", IRC_REMOVEDEXEMPT, s);
-    for (chan = chanset; chan != NULL; chan = chan->next)
-      add_mode(chan, '-', 'e', s);
-    return;
+  if (console) {
+    i = u_delexempt(NULL, s, (u->flags & USER_MASTER));
+    if (i > 0) {
+      if (lastdeletedmask)
+        mask = lastdeletedmask;
+      else
+        mask = s;
+      putlog(LOG_CMDS, "*", "#%s# -exempt %s", dcc[idx].nick, mask);
+      dprintf(idx, "%s: %s\n", IRC_REMOVEDEXEMPT, mask);
+      for (chan = chanset; chan != NULL; chan = chan->next)
+        add_mode(chan, '-', 'e', mask);
+      return;
+    }
   }
   /* Channel-specific exempt? */
   if (chname)
     chan = findchan_by_dname(chname);
   if (chan) {
-    if (atoi(exempt) > 0) {
-      egg_snprintf(s, sizeof s, "%d", -i);
-      j = u_delexempt(chan, s, 1);
-      if (j > 0) {
-	putlog(LOG_CMDS, "*", "#%s# (%s) -exempt %s", dcc[idx].nick,
-	       chan->dname, s);
-	dprintf(idx, "Removed %s channel exempt: %s\n", chan->dname, s);
-	add_mode(chan, '-', 'e', s);
-	return;
+    if ((i = atoi(exempt)) > 0) {
+      /* substract the numer of global exempts to get the number of the channel exempt */
+      egg_snprintf(s, sizeof s, "%d", i);
+      j = u_delexempt(0, s, 0);
+      if (j < 0) {
+        egg_snprintf(s, sizeof s, "%d", -j);
+        j = u_delexempt(chan, s, 1);
+        if (j > 0) {
+          if (lastdeletedmask)
+            mask = lastdeletedmask;
+          else
+            mask = s;
+          putlog(LOG_CMDS, "*", "#%s# (%s) -exempt %s", dcc[idx].nick,
+                 chan->dname, mask);
+          dprintf(idx, "Removed %s channel exempt: %s\n", chan->dname, mask);
+          add_mode(chan, '-', 'e', mask);
+          return;
+        }
       }
       i = 0;
       for (e = chan->channel.exempt; e && e->mask && e->mask[0]; e = e->next) {
-	if (!u_equals_mask(global_exempts, e->mask) &&
-	    !u_equals_mask(chan->exempts, e->mask)) {
-	  i++;
-	  if (i == -j) {
-	    add_mode(chan, '-', 'e', e->mask);
-	    dprintf(idx, "%s '%s' on %s.\n", IRC_REMOVEDEXEMPT,
-		    e->mask, chan->dname);
-	    putlog(LOG_CMDS, "*", "#%s# (%s) -exempt %s [on channel]",
-		   dcc[idx].nick, dcc[idx].u.chat->con_chan, exempt);
-	    return;
-	  }
-	}
+        if (!u_equals_mask(global_exempts, e->mask) &&
+            !u_equals_mask(chan->exempts, e->mask)) {
+          i++;
+          if (i == -j) {
+            add_mode(chan, '-', 'e', e->mask);
+            dprintf(idx, "%s '%s' on %s.\n", IRC_REMOVEDEXEMPT,
+                    e->mask, chan->dname);
+            putlog(LOG_CMDS, "*", "#%s# (%s) -exempt %s [on channel]",
+                   dcc[idx].nick, dcc[idx].u.chat->con_chan, exempt);
+            return;
+          }
+        }
       }
     } else {
       j = u_delexempt(chan, exempt, 1);
       if (j > 0) {
-	putlog(LOG_CMDS, "*", "#%s# (%s) -exempt %s", dcc[idx].nick,
-	       dcc[idx].u.chat->con_chan, exempt);
-	dprintf(idx, "Removed %s channel exempt: %s\n", chname, exempt);
-	add_mode(chan, '-', 'e', exempt);
-	return;
+        putlog(LOG_CMDS, "*", "#%s# (%s) -exempt %s", dcc[idx].nick,
+               dcc[idx].u.chat->con_chan, exempt);
+        dprintf(idx, "Removed %s channel exempt: %s\n", chname, exempt);
+        add_mode(chan, '-', 'e', exempt);
+        return;
       }
       for (e = chan->channel.exempt; e && e->mask && e->mask[0]; e = e->next) {
-	if (!rfc_casecmp(e->mask, exempt)) {
-	  add_mode(chan, '-', 'e', e->mask);
-	  dprintf(idx, "%s '%s' on %s.\n",
-		  IRC_REMOVEDEXEMPT, e->mask, chan->dname);
-	  putlog(LOG_CMDS, "*", "#%s# (%s) -exempt %s [on channel]",
-		 dcc[idx].nick, dcc[idx].u.chat->con_chan, exempt);
-	  return;
-	}
+        if (!rfc_casecmp(e->mask, exempt)) {
+          add_mode(chan, '-', 'e', e->mask);
+          dprintf(idx, "%s '%s' on %s.\n",
+                  IRC_REMOVEDEXEMPT, e->mask, chan->dname);
+          putlog(LOG_CMDS, "*", "#%s# (%s) -exempt %s [on channel]",
+                 dcc[idx].nick, dcc[idx].u.chat->con_chan, exempt);
+          return;
+        }
       }
     }
+  } else {
+    dprintf(idx, "Invalid channel.\n");
+    return;
   }
   dprintf(idx, "No such exemption.\n");
 }
 
 static void cmd_mns_invite (struct userrec *u, int idx, char *par)
 {
-  int i = 0, j;
+  int console = 0, i = 0, j;
   struct chanset_t *chan = NULL;
-  char s[UHOSTLEN], *invite, *chname;
+  char s[UHOSTLEN], *invite, *chname, *mask;
   masklist *inv;
 
   if (!use_invites) {
@@ -608,80 +634,101 @@ static void cmd_mns_invite (struct userrec *u, int idx, char *par)
   invite = newsplit(&par);
   if (par[0] && strchr(CHANMETA, par[0]))
     chname = newsplit(&par);
-  else
+  else {
     chname = dcc[idx].u.chat->con_chan;
+    console = 1;
+  }
   if (chname || !(u->flags & USER_MASTER)) {
     if (!chname)
       chname = dcc[idx].u.chat->con_chan;
-    get_user_flagrec(u,&user,chname);
-    if (!((glob_op(user) && !chan_deop(user)) || chan_op(user))) {
+    get_user_flagrec(u, &user, chname);
+    if ((!chan_op(user) && (!glob_op(user) || chan_deop(user)))) {
       dprintf(idx, "You don't have access to remove invites on %s.\n", chname);
       return;
     }
   }
   strncpyz(s, invite, sizeof s);
-  i = u_delinvite(NULL, s, (u->flags & USER_MASTER));
-  if (i > 0) {
-    putlog(LOG_CMDS, "*", "#%s# -invite %s", dcc[idx].nick, s);
-    dprintf(idx, "%s: %s\n", IRC_REMOVEDINVITE, s);
-    for (chan = chanset; chan != NULL; chan = chan->next)
-      add_mode(chan, '-', 'I', s);
-    return;
+  if (console) {
+    i = u_delinvite(NULL, s, (u->flags & USER_MASTER));
+    if (i > 0) {
+      if (lastdeletedmask)
+        mask = lastdeletedmask;
+      else
+        mask = s;
+      putlog(LOG_CMDS, "*", "#%s# -invite %s", dcc[idx].nick, mask);
+      dprintf(idx, "%s: %s\n", IRC_REMOVEDINVITE, mask);
+      for (chan = chanset; chan != NULL; chan = chan->next)
+        add_mode(chan, '-', 'I', mask);
+      return;
+    }
   }
   /* Channel-specific invite? */
   if (chname)
     chan = findchan_by_dname(chname);
   if (chan) {
-    if (atoi(invite) > 0) {
-      egg_snprintf(s, sizeof s, "%d", -i);
-      j = u_delinvite(chan, s, 1);
-      if (j > 0) {
-	putlog(LOG_CMDS, "*", "#%s# (%s) -invite %s", dcc[idx].nick,
-	       chan->dname, s);
-	dprintf(idx, "Removed %s channel invite: %s\n", chan->dname, s);
-	add_mode(chan, '-', 'I', s);
-	return;
+    if ((i = atoi(invite)) > 0) {
+      /* substract the numer of global invites to get the number of the channel invite */
+      egg_snprintf(s, sizeof s, "%d", i);
+      j = u_delinvite(0, s, 0);
+      if (j < 0) {
+        egg_snprintf(s, sizeof s, "%d", -j);
+        j = u_delinvite(chan, s, 1);
+        if (j > 0) {
+          if (lastdeletedmask)
+            mask = lastdeletedmask;
+          else
+            mask = s;
+          putlog(LOG_CMDS, "*", "#%s# (%s) -invite %s", dcc[idx].nick,
+                 chan->dname, mask);
+          dprintf(idx, "Removed %s channel invite: %s\n", chan->dname, mask);
+          add_mode(chan, '-', 'I', mask);
+          return;
+        }
       }
       i = 0;
       for (inv = chan->channel.invite; inv && inv->mask && inv->mask[0];
-	   inv = inv->next) {
-	if (!u_equals_mask(global_invites, inv->mask) &&
-	    !u_equals_mask(chan->invites, inv->mask)) {
-	  i++;
-	  if (i == -j) {
-	    add_mode(chan, '-', 'I', inv->mask);
-	    dprintf(idx, "%s '%s' on %s.\n", IRC_REMOVEDINVITE,
-		    inv->mask, chan->dname);
-	    putlog(LOG_CMDS, "*", "#%s# (%s) -invite %s [on channel]",
-		   dcc[idx].nick, dcc[idx].u.chat->con_chan, invite);
-	    return;
-	  }
-	}
+           inv = inv->next) {
+        if (!u_equals_mask(global_invites, inv->mask) &&
+            !u_equals_mask(chan->invites, inv->mask)) {
+          i++;
+          if (i == -j) {
+            add_mode(chan, '-', 'I', inv->mask);
+            dprintf(idx, "%s '%s' on %s.\n", IRC_REMOVEDINVITE,
+                    inv->mask, chan->dname);
+            putlog(LOG_CMDS, "*", "#%s# (%s) -invite %s [on channel]",
+                   dcc[idx].nick, dcc[idx].u.chat->con_chan, invite);
+            return;
+          }
+        }
       }
     } else {
       j = u_delinvite(chan, invite, 1);
       if (j > 0) {
-	putlog(LOG_CMDS, "*", "#%s# (%s) -invite %s", dcc[idx].nick,
-	       dcc[idx].u.chat->con_chan, invite);
-	dprintf(idx, "Removed %s channel invite: %s\n", chname, invite);
-	add_mode(chan, '-', 'I', invite);
-	return;
+        putlog(LOG_CMDS, "*", "#%s# (%s) -invite %s", dcc[idx].nick,
+               dcc[idx].u.chat->con_chan, invite);
+        dprintf(idx, "Removed %s channel invite: %s\n", chname, invite);
+        add_mode(chan, '-', 'I', invite);
+        return;
       }
       for (inv = chan->channel.invite; inv && inv->mask && inv->mask[0];
-	   inv = inv->next) {
-	if (!rfc_casecmp(inv->mask, invite)) {
-	  add_mode(chan, '-', 'I', inv->mask);
-	  dprintf(idx, "%s '%s' on %s.\n",
-		  IRC_REMOVEDINVITE, inv->mask, chan->dname);
-	  putlog(LOG_CMDS, "*", "#%s# (%s) -invite %s [on channel]",
-		 dcc[idx].nick, dcc[idx].u.chat->con_chan, invite);
-	  return;
-	}
+           inv = inv->next) {
+        if (!rfc_casecmp(inv->mask, invite)) {
+          add_mode(chan, '-', 'I', inv->mask);
+          dprintf(idx, "%s '%s' on %s.\n",
+                  IRC_REMOVEDINVITE, inv->mask, chan->dname);
+          putlog(LOG_CMDS, "*", "#%s# (%s) -invite %s [on channel]",
+                 dcc[idx].nick, dcc[idx].u.chat->con_chan, invite);
+          return;
+        }
       }
     }
+  } else {
+    dprintf(idx, "Invalid channel.\n");
+    return;
   }
   dprintf(idx, "No such invite.\n");
 }
+
 #endif
 static void cmd_bans(struct userrec *u, int idx, char *par)
 {

src/mod/irc.mod/msgcmds.c

@@ -82,12 +82,16 @@ static int msg_ident(char *nick, char *host, struct userrec *u, char *par)
       if (!quiet_reject)
 	dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_DENYACCESS);
     } else if (u == u2) {
-      if (!quiet_reject)
-	dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_RECOGNIZED);
+      /*
+       * NOTE: Checking quiet_reject *after* u_pass_match()
+       * verifies the password makes NO sense!
+       * (Broken since 1.3.0+bel17)  Bad Beldin! No Cookie!
+       *   -Toth  [July 30, 2003]
+       */
+      dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_RECOGNIZED);
       return 1;
     } else if (u) {
-      if (!quiet_reject)
-	dprintf(DP_HELP, IRC_MISIDENT, nick, who, u->handle);
+      dprintf(DP_HELP, IRC_MISIDENT, nick, who, u->handle);
       return 1;
     } else {
       putlog(LOG_CMDS, "*", "(%s!%s) !*! IDENT %s", nick, host, who);

src/mod/server.mod/server.c

@@ -1234,7 +1234,7 @@ static int server_6char STDVAR
   Function F = (Function) cd;
   char x[20];
 
-  BADARGS(7, 7, " nick user@host handle desto/chan keyword/nick text");
+  BADARGS(7, 7, " nick user@host handle dest/chan keyword/nick text");
   CHECKVALIDITY(server_6char);
   egg_snprintf(x, sizeof x, "%d",
 	       F(argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]));
@@ -1246,7 +1246,7 @@ static int server_5char STDVAR
 {
   Function F = (Function) cd;
 
-  BADARGS(6, 6, " nick user@host handle channel text");
+  BADARGS(6, 6, " nick user@host handle dest/channel text");
   CHECKVALIDITY(server_5char);
   F(argv[1], argv[2], argv[3], argv[4], argv[5]);
   return TCL_OK;
@@ -2052,7 +2052,7 @@ char *server_start(Function *global_funcs)
 
   H_wall = add_bind_table("wall", HT_STACKABLE, server_2char);
   H_raw = add_bind_table("raw", HT_STACKABLE, server_raw);
-  H_notc = add_bind_table("notc", HT_STACKABLE, server_6char);
+  H_notc = add_bind_table("notc", HT_STACKABLE, server_5char);
   H_msgm = add_bind_table("msgm", HT_STACKABLE, server_msg);
   H_msgc = add_bind_table("msgc", 0, server_msgc);
   H_msg = add_bind_table("msg", 0, server_msg);

src/tclmisc.c

@@ -371,6 +371,8 @@ static int tcl_duration STDVAR
     tmp = (sec);
     sprintf(&s[strlen(s)], "%lu second%s", tmp, (tmp == 1) ? "" : "s");
   }
+  if (strlen(s) > 0 && s[strlen(s) - 1] == ' ')
+    s[strlen(s) - 1] = 0;
   Tcl_AppendResult(irp, s, NULL);
   return TCL_OK;
 }

src/tcluser.c

@@ -8,6 +8,8 @@
 #include "users.h"
 #include "chan.h"
 #include "tandem.h"
+#include "modules.h"
+
 
 extern Tcl_Interp	*interp;
 extern struct userrec	*userlist;
@@ -495,6 +497,7 @@ static int tcl_setuser STDVAR
   struct userrec *u;
   struct user_entry *e;
   int r;
+  module_entry *me;
 
   BADARGS(3, 999, " handle type ?setting....?");
   if (!(et = find_entry_type(argv[2]))) {
@@ -508,6 +511,12 @@ static int tcl_setuser STDVAR
     } else
       return TCL_OK;		/* Silently ignore user * */
   }
+  me = module_find("irc", 0, 0);
+  if (me && !strcmp(argv[2], "hosts") && argc == 3) {
+    Function *func = me->funcs;
+
+    (func[IRC_CHECK_THIS_USER]) (argv[1], 1, NULL);
+  }
   if (!(e = find_user_entry(et, u))) {
     e = user_malloc(sizeof(struct user_entry));
     e->type = et;
@@ -523,6 +532,11 @@ static int tcl_setuser STDVAR
       nfree(e);
     /* else maybe already freed... (entry_type==HOSTS) <drummer> */
   }
+  if (me && !strcmp(argv[2], "hosts") && argc == 4) {
+    Function *func = me->funcs;
+
+    (func[IRC_CHECK_THIS_USER]) (argv[1], 0, NULL);
+  }
   return r;
 }