CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_06
Commit time: 2003-11-06 21:24:09 UTC
Modified files:
Tag: u2_10_11_06
ChangeLog ircd/gline.c
Log message:
Author: Isomer <[EMAIL PROTECTED]>
Log message:
Fix more cores in make_gline()
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.129.2.11 ircu2.10/ChangeLog:1.290.2.129.2.12
--- ircu2.10/ChangeLog:1.290.2.129.2.11 Thu Nov 6 02:58:45 2003
+++ ircu2.10/ChangeLog Thu Nov 6 13:23:58 2003
@@ -1,4 +1,7 @@
2003-11-06 Isomer <[EMAIL PROTECTED]>
+ * include/gline.c: Fix more cores in make_gline.c
+
+2003-11-06 Isomer <[EMAIL PROTECTED]>
* include/s_user.c: Fix ERR_UMODEUNKNOWNFLAG (again)
2003-11-06 Isomer <[EMAIL PROTECTED]>
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.38.2.8.2.4 ircu2.10/ircd/gline.c:1.38.2.8.2.5
--- ircu2.10/ircd/gline.c:1.38.2.8.2.4 Wed Nov 5 02:47:04 2003
+++ ircu2.10/ircd/gline.c Thu Nov 6 13:23:58 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.4 2003/11/05 10:47:04 isomer Exp $
+ * $Id: gline.c,v 1.38.2.8.2.5 2003/11/06 21:23:58 isomer Exp $
*/
#include "config.h"
@@ -98,8 +98,10 @@
gline_free(gline);
else if ((gline->gl_flags & GLINE_LOCAL) != (flags & GLINE_LOCAL))
continue;
- else if (!mmatch(gline->gl_user, user) && /* gline contains new mask */
- (gline->gl_host == NULL || !mmatch(gline->gl_host, host))) {
+ else if ( /* Both have gl_host set, or unset */
+ ((NULL == gline->gl_host) ^ (NULL==host))
+ && !mmatch(gline->gl_user, user) /* gline contains new mask */
+ && (gline->gl_host == NULL || !mmatch(gline->gl_host, host))) {
if (expire <= gline->gl_expire) /* will expire before wider gline */
return 0;
else
----------------------- End of diff -----------------------
