CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_05
Commit time: 2003-10-25 04:42:56 UTC
Modified files:
Tag: u2_10_11_05
ChangeLog ircd/gline.c
Log message:
Author: Isomer <[EMAIL PROTECTED]>
Log message:
missed a place where gl_host could be null, fixed.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.128.2.39 ircu2.10/ChangeLog:1.290.2.128.2.40
--- ircu2.10/ChangeLog:1.290.2.128.2.39 Fri Oct 24 21:19:18 2003
+++ ircu2.10/ChangeLog Fri Oct 24 21:42:46 2003
@@ -1,3 +1,7 @@
+2003-10-25 Isomer <[EMAIL PROTECTED]>
+ * ircd/gline.c: When comparing hosts for equality, check that
+ one isn't NULL.
+
2003-10-25 Entrope <[EMAIL PROTECTED]>
* ircd/channel.c: Move IsUserParting() test up so we do not
send the part to other servers.
@@ -7,6 +11,7 @@
parting a channel.
* ircd/channel.c: Use it.
+
2003-10-25 Isomer <[EMAIL PROTECTED]>
* ircd/gline.c: Make sure we never use the gl_host variable when we
are dealing with a realname (or other magical) gline.
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.38.2.7.4.3 ircu2.10/ircd/gline.c:1.38.2.7.4.4
--- ircu2.10/ircd/gline.c:1.38.2.7.4.3 Fri Oct 24 20:00:04 2003
+++ ircu2.10/ircd/gline.c Fri Oct 24 21:42:46 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.7.4.3 2003/10/25 03:00:04 isomer Exp $
+ * $Id: gline.c,v 1.38.2.7.4.4 2003/10/25 04:42:46 isomer Exp $
*/
#include "config.h"
@@ -106,7 +106,7 @@
else
after = gline; /* stick new gline after this one */
} else if (!mmatch(user, gline->gl_user) && /* new mask contains gline */
- !mmatch(host, gline->gl_host) &&
+ gline->gl_host && !mmatch(host, gline->gl_host) &&
gline->gl_expire <= expire) /* gline expires before new one */
gline_free(gline); /* save some memory */
}
@@ -366,6 +366,7 @@
break;
}
user = (*userhost =='$' ? userhost : userhost+2);
+ host = 0;
} else {
canon_userhost(userhost, &user, &host, "*");
if (sizeof(uhmask) <
----------------------- End of diff -----------------------
