From: Michael Poole <mdpoole@troilus.org>
Date: Sun, 8 May 2005 02:42:04 +0000 (+0000)
Subject: Revert mode source when opping a user on channel creation (bug #1197510).
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=25485b46bf4e168692ce56ad9df050d0ee0c1fd4

Revert mode source when opping a user on channel creation (bug #1197510).


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

diff --git a/ChangeLog b/ChangeLog
index 8d6f411..c6b05ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-07  Michael Poole <mdpoole@troilus.org>
+
+	* ircd/channel.c (joinbuf_join): Be smarter about what source to
+	use when opping a user that joins a channel.
+
 2005-05-04  Reed Loden <reed@reedloden.com>
 
 	* ircd/m_trace.c (do_trace): Show the real nickname instead of the
diff --git a/ircd/channel.c b/ircd/channel.c
index ddb85d7..472d927 100644
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -3417,7 +3417,8 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
 
       /* send an op, too, if needed */
       if (flags & CHFL_CHANOP)
-	sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan, NULL, 0, "%H +o %C",
+	sendcmdto_channel_butserv_butone((chan->mode.apass[0] ? &me : jbuf->jb_source),
+                                         CMD_MODE, chan, NULL, 0, "%H +o %C",
 					 chan, jbuf->jb_source);
     } else if (MyUser(jbuf->jb_source))
       sendcmdto_one(jbuf->jb_source, CMD_JOIN, jbuf->jb_source, ":%H", chan);