[Patches] [CVS] Module ircu2.10: Change committed

[Perry Lorier]

CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Branch tags: u2_10_11_06
Commit time: 2003-12-01 10:28:47 UTC

Modified files:
  Tag: u2_10_11_06
     ChangeLog ircd/gline.c

Log message:

Author: Isomer <[EMAIL PROTECTED]>
Log message:

* Updated ChangeLog correcting a developers name
* Merging in netski's patches

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.129.2.26 ircu2.10/ChangeLog:1.290.2.129.2.27
--- ircu2.10/ChangeLog:1.290.2.129.2.26 Sat Nov 22 09:07:41 2003
+++ ircu2.10/ChangeLog  Mon Dec  1 02:28:36 2003
@@ -1,3 +1,8 @@
+2003-11-30  Perry Lorier <[EMAIL PROTECTED]>
+       * ircd/gline.c: Patch canon_userhost as suggested by netski
+
+       * ChangeLog: Fix up contributers name
+
 2003-11-22  Kevin L Mitchell  <[EMAIL PROTECTED]>
 
        * tools/wrapper.c: commit uid on chroot fix from ubra
@@ -113,7 +118,7 @@
        * ircd/engine_epoll.c, config.h.in, configure,in, ircd/ircd_events.h:
        Added epoll(2) support.
 
-2003-07-18 Patrick N. <[EMAIL PROTECTED]>
+2003-07-18 |SmAsH| <[EMAIL PROTECTED]>
        * ircd/s_user.c: added sending of ERR_UMODEUNKNOWNFLAG (Updated by
        Isomer with suggestions from wasted)
 
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.38.2.8.2.10 ircu2.10/ircd/gline.c:1.38.2.8.2.11
--- ircu2.10/ircd/gline.c:1.38.2.8.2.10 Sat Nov 22 07:07:57 2003
+++ ircu2.10/ircd/gline.c       Mon Dec  1 02:28:37 2003
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: gline.c,v 1.38.2.8.2.10 2003/11/22 15:07:57 klmitch Exp $
+ * $Id: gline.c,v 1.38.2.8.2.11 2003/12/01 10:28:37 isomer Exp $
  */
 #include "config.h"
 
@@ -71,6 +71,11 @@
 canon_userhost(char *userhost, char **user_p, char **host_p, char *def_user)
 {
   char *tmp;
+  if (*userhost == '$') {
+    *user_p = userhost;
+    *host_p = NULL;
+    return;
+  }
 
   if (!(tmp = strchr(userhost, '@'))) {
     *user_p = def_user;
@@ -613,19 +618,20 @@
             (flags & GLINE_LASTMOD && !gline->gl_lastmod))
       continue;
     else if (flags & GLINE_EXACT) {
-      if (gline->gl_host && ircd_strcmp(gline->gl_host, host) == 0 &&
+      if (!gline->gl_host && ircd_strcmp(gline->gl_host, host) == 0 &&
          ((!user && ircd_strcmp(gline->gl_user, "*") == 0) ||
           ircd_strcmp(gline->gl_user, user) == 0))
        break;
     } else {
-      if (gline->gl_host && match(gline->gl_host, host) == 0 &&
+      if (!gline->gl_host && match(gline->gl_host, host) == 0 &&
          ((!user && ircd_strcmp(gline->gl_user, "*") == 0) ||
           match(gline->gl_user, user) == 0))
       break;
     }
   }
 
-  MyFree(t_uh);
+  if (!BadPtr(t_uh))
+    MyFree(t_uh);
 
   return gline;
 }
----------------------- End of diff -----------------------