Forward port patch from 2.10.11 (reported by Reed).

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

diff --git a/ChangeLog b/ChangeLog
index 7377e55f5e5d57516cf2fcc1bd13d7c32ed31050..89a7015fc75c7858bd6caded1caffe43606eb762 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-04  Kevin L Mitchell  <klmitch@mit.edu>
+
+       * ircd/s_numeric.c (do_numeric): fix a crash when a numeric is
+       sent to a channel...
+
 2005-10-06  Michael Poole <mdpoole@troilus.org>
 
        * ircd/m_join.c (m_join): Report too-long channel names as

diff --git a/ircd/s_numeric.c b/ircd/s_numeric.c
index a5689029e0979a26af594de95537a8f6179a0bd5..333d0f007f55c9a79dc47f9dafeb9c5f4c2f4280 100644 (file)
--- a/ircd/s_numeric.c
+++ b/ircd/s_numeric.c
@@ -98,8 +98,7 @@ int do_numeric(int numeric, int nnn, struct Client *cptr, struct Client *sptr,
                     &me : sptr,
                   num, num, acptr, "%C %s", acptr, parv[2]);
   else
-    sendcmdto_channel_butone((feature_bool(FEAT_HIS_REWRITE) && !IsOper(acptr)) ?
-                               &me : sptr,
+    sendcmdto_channel_butone(feature_bool(FEAT_HIS_REWRITE) ? &me : sptr,
                              num, num, achptr, cptr, SKIP_DEAF | SKIP_BURST,
                              "%H %s", achptr, parv[2]);
   return 0;