CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_06
Commit time: 2003-11-18 10:14:22 UTC
Modified files:
Tag: u2_10_11_06
ChangeLog ircd/gline.c ircd/m_whois.c
Log message:
Author: Isomer <[EMAIL PROTECTED]>
Log message:
fix core in gline.c (again!)
Fix showing too many channels in m_whois.c
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.129.2.16 ircu2.10/ChangeLog:1.290.2.129.2.17
--- ircu2.10/ChangeLog:1.290.2.129.2.16 Tue Nov 18 02:09:43 2003
+++ ircu2.10/ChangeLog Tue Nov 18 02:14:09 2003
@@ -1,3 +1,9 @@
+2003-11-18 Isomer <[EMAIL PROTECTED]>
+ * ircd/gline.c: Fix broken test that causes core dumps on realname
+ glines.
+
+ * ircd/m_whois.c: Fix lost ! from ShowChannel()
+
2003-11-17 Entrope <[EMAIL PROTECTED]>
* ircd/engine_epoll.c: #include <sys/types.h>, which is
reportedly necessary on certain RedHat releases.
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.38.2.8.2.7 ircu2.10/ircd/gline.c:1.38.2.8.2.8
--- ircu2.10/ircd/gline.c:1.38.2.8.2.7 Mon Nov 10 00:14:19 2003
+++ ircu2.10/ircd/gline.c Tue Nov 18 02:14:10 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.7 2003/11/10 08:14:19 isomer Exp $
+ * $Id: gline.c,v 1.38.2.8.2.8 2003/11/18 10:14:10 isomer Exp $
*/
#include "config.h"
@@ -109,7 +109,7 @@
} else if (
!((NULL == gline->gl_host) ^ (NULL==host))
&& !mmatch(user, gline->gl_user) /* new mask contains gline */
- && (gline->gl_host || !mmatch(host, gline->gl_host))
+ && (gline->gl_host==NULL || !mmatch(host, gline->gl_host))
&& gline->gl_expire <= expire) /* old expires before new */
gline_free(gline); /* save some memory */
}
Index: ircu2.10/ircd/m_whois.c
diff -u ircu2.10/ircd/m_whois.c:1.19.2.11.2.1 ircu2.10/ircd/m_whois.c:1.19.2.11.2.2
--- ircu2.10/ircd/m_whois.c:1.19.2.11.2.1 Wed Nov 5 01:56:57 2003
+++ ircu2.10/ircd/m_whois.c Tue Nov 18 02:14:11 2003
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_whois.c,v 1.19.2.11.2.1 2003/11/05 09:56:57 isomer Exp $
+ * $Id: m_whois.c,v 1.19.2.11.2.2 2003/11/18 10:14:11 isomer Exp $
*/
/*
@@ -153,7 +153,7 @@
chptr = chan->channel;
if (!(IsOper(sptr) && IsLocalChannel(chptr->chname))
- && ShowChannel(sptr, chptr))
+ && !ShowChannel(sptr, chptr))
continue;
if (acptr != sptr && IsZombie(chan))
----------------------- End of diff -----------------------
