Convert a &me to &his in do_settopic().

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

diff --git a/ChangeLog b/ChangeLog
index a83e5c438c0f2b595473e5e47da832edce32aa42..219475b449355302ef6688a583177c86f4b6cfcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
 
        * ircd/m_kick.c (ms_kick): Likewise.
 
+       * ircd/m_topic.c (do_settopic): Another &me -> &his change for
+       HIS, and use that apparent source for the channel localcast.
+
 2005-08-16  Jukka Ollila <jaollila@niksula.hut.fi>
 
        * ircd/s_user.c (hide_hostmask): Use HIS_SERVERNAME instead of the

diff --git a/ircd/m_topic.c b/ircd/m_topic.c
index c12a5ddc141fea694c88023e353ee1759e74a895..44b5c48c505f4b5e7c55f7f863b267035dde8fb7 100644 (file)
--- a/ircd/m_topic.c
+++ b/ircd/m_topic.c
@@ -104,7 +104,7 @@ static void do_settopic(struct Client *sptr, struct Client *cptr,
    int newtopic;
 
    if (feature_bool(FEAT_HIS_BANWHO) && IsServer(sptr))
-       from = &me;
+       from = &his;
    else
        from = sptr;
    if (IsChannelService(sptr))
@@ -136,7 +136,7 @@ static void do_settopic(struct Client *sptr, struct Client *cptr,
      sendcmdto_serv_butone(sptr, CMD_TOPIC, cptr, "%H %Tu %Tu :%s", chptr,
                           chptr->creationtime, chptr->topic_time, chptr->topic);
    if (newtopic)
-     sendcmdto_channel_butserv_butone(sptr, CMD_TOPIC, chptr, NULL, 0,
+     sendcmdto_channel_butserv_butone(from, CMD_TOPIC, chptr, NULL, 0,
                                       "%H :%s", chptr, chptr->topic);
       /* if this is the same topic as before we send it to the person that
        * set it (so they knew it went through ok), but don't bother sending