Author: Kev <klmitch@mit.edu>

Log message:

Fix bug where user parting local channel never really leaves

Status: Tested, works
Testing needed: QA only

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

diff --git a/ChangeLog b/ChangeLog
index c929282ff07e64b35f7359379daa3775cf40114a..b19e336b8ab4a76e925fefbf85e94684d2685c19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-02  Kevin L. Mitchell  <klmitch@mit.edu>
+
+       * ircd/channel.c (joinbuf_join): really remove user from local
+       channels
+
 2000-05-29  Perry Lorier       <Isomer@coders.net>
        * ircd/m_names.c: Removed redundant space. 
        * ircd/s_bsd.c: Fixed incorrect syntax on ERROR line.
@@ -1154,7 +1159,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.138 2000-05-29 10:37:33 isomer Exp $
+# $Id: ChangeLog,v 1.139 2000-06-02 14:49:29 kev Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/ircd/channel.c b/ircd/channel.c
index cbc46abfaf78e04774ff882fb9c4a423ffdc9568..4517ecec71b1884de5129a8a303e276b2ca3283a 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -3944,7 +3944,8 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
        * exactly the same logic, albeit somewhat more concise, as was in
        * the original m_part.c */
 
-      if (jbuf->jb_type == JOINBUF_TYPE_PARTALL) /* got to remove user here */
+      if (jbuf->jb_type == JOINBUF_TYPE_PARTALL ||
+         IsLocalChannel(chan->chname)) /* got to remove user here */
        remove_user_from_channel(jbuf->jb_source, chan);
     } else {
       /* Add user to channel */