Committer  : entrope
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Commit time: 2006-08-06 13:18:17 UTC

Modified files:
     ircd/m_list.c ChangeLog

Log message:

Fix crash on DEFAULT_LIST_PARAM containing 's' or 'S'.

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.818 ircu2.10/ChangeLog:1.819
--- ircu2.10/ChangeLog:1.818    Wed Aug  2 20:32:46 2006
+++ ircu2.10/ChangeLog  Sun Aug  6 06:18:07 2006
@@ -1,3 +1,8 @@
+2006-08-06  Michael Poole <[EMAIL PROTECTED]>
+
+       * ircd/m_list.c (param_parse): Ignore 's' and 'S' in the
+       DEFAULT_LIST_PARAM setting. (Bug #1534814)
+
 2006-08-02  Michael Poole <[EMAIL PROTECTED]>
 
        * include/msgq.h (MsgQList): Add 'sent' field.
Index: ircu2.10/ircd/m_list.c
diff -u ircu2.10/ircd/m_list.c:1.17 ircu2.10/ircd/m_list.c:1.18
--- ircu2.10/ircd/m_list.c:1.17 Tue Jul  4 12:44:38 2006
+++ ircu2.10/ircd/m_list.c      Sun Aug  6 06:18:07 2006
@@ -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_list.c,v 1.17 2006/07/04 19:44:38 entrope Exp $
+ * $Id: m_list.c,v 1.18 2006/08/06 13:18:07 entrope Exp $
  */
 
 #include "config.h"
@@ -206,6 +206,12 @@
 
     case 'S':
     case 's':
+      /* Admins have no business making the default LIST include
+       * secret channels, even if it is just for opers with the
+       * LIST_CHAN privilege. */
+      if (!sptr)
+        break;
+
       if (!IsAnOper(sptr) || !HasPriv(sptr, PRIV_LIST_CHAN))
         return show_usage(sptr);
 
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches

Reply via email to