Author: Kev <klmitch@mit.edu>

Log message:

Fix a core bug in is_silenced() when sptr is a server.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1291 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 405c659a38216aa6e6298417836abe7ed042419f..f96560ba2f0dd61eca18bc7e0484db4bfb6eae4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-03  Kevin L Mitchell  <klmitch@mit.edu>
+
+       * ircd/s_user.c (is_silenced): is_silenced() would core if sptr
+       was a server; fixed to skip servers
+
 2004-12-28  Michael Poole <mdpoole@troilus.org>
 
        * include/s_bsd.h (VirtualHost): Replace with separate variables

diff --git a/ircd/s_user.c b/ircd/s_user.c
index 1f26e6f2e357a4af1125b3d01f342c3757042b89..364ddd3b86d58392bf635b9e2784e3824b9aceed 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -1671,7 +1671,7 @@ void set_snomask(struct Client *cptr, unsigned int newmask, int what)
 /** Check whether \a sptr is allowed to send a message to \a acptr.
  * If \a sptr is a remote user, it means some server has an outdated
  * SILENCE list for \a acptr, so send the missing SILENCE mask(s) back
- * in the direction of \a sptr.
+ * in the direction of \a sptr.  Skip the check if \a sptr is a server.
  * @param[in] sptr Client trying to send a message.
  * @param[in] acptr Destination of message.
  * @return Non-zero if \a sptr is SILENCEd by \a acptr, zero if not.
@@ -1683,7 +1683,7 @@ int is_silenced(struct Client *sptr, struct Client *acptr)
   size_t buf_used, slen;
   char buf[BUFSIZE];
 
-  if (!(user = cli_user(acptr))
+  if (IsServer(sptr) || !(user = cli_user(acptr))
       || !(found = find_ban(sptr, user->silence)))
     return 0;
   assert(!(found->flags & BAN_EXCEPTION));