Wallops (and log) upon setting/unsetting of +M or any hidden chmode.

[irc/rqf/shadowircd.git] / src / s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index cc3db10df26842ddf3ea2ec053602dde70b98dd4..5f272b005ee69e35413a58fb5c196d3db8f754b6 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_serv.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
@@ -89,6 +88,8 @@ struct Capability captab[] = {
        { "SAVE",       CAP_SAVE },
        { "EUID",       CAP_EUID },
        { "EOPMOD",     CAP_EOPMOD },
+       { "BAN",        CAP_BAN },
+       { "MLOCK",      CAP_MLOCK },
        {0, 0}
 };
 
@@ -392,6 +393,67 @@ send_capabilities(struct Client *client_p, int cap_can_send)
        sendto_one(client_p, "CAPAB :%s", msgbuf);
 }
 
+static void
+burst_ban(struct Client *client_p)
+{
+       rb_dlink_node *ptr;
+       struct ConfItem *aconf;
+       const char *type, *oper;
+       /* +5 for !,@,{,} and null */
+       char operbuf[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
+       char *p;
+       size_t melen;
+
+       melen = strlen(me.name);
+       RB_DLINK_FOREACH(ptr, prop_bans.head)
+       {
+               aconf = ptr->data;
+
+               /* Skip expired stuff. */
+               if(aconf->lifetime < rb_current_time())
+                       continue;
+               switch(aconf->status & ~CONF_ILLEGAL)
+               {
+                       case CONF_KILL: type = "K"; break;
+                       case CONF_DLINE: type = "D"; break;
+                       case CONF_XLINE: type = "X"; break;
+                       case CONF_RESV_NICK: type = "R"; break;
+                       case CONF_RESV_CHANNEL: type = "R"; break;
+                       default:
+                               continue;
+               }
+               oper = aconf->info.oper;
+               if(aconf->flags & CONF_FLAGS_MYOPER)
+               {
+                       /* Our operator{} names may not be meaningful
+                        * to other servers, so rewrite to our server
+                        * name.
+                        */
+                       rb_strlcpy(operbuf, aconf->info.oper, sizeof buf);
+                       p = strrchr(operbuf, '{');
+                       if (p != NULL &&
+                                       operbuf + sizeof operbuf - p > (ptrdiff_t)(melen + 2))
+                       {
+                               memcpy(p + 1, me.name, melen);
+                               p[melen + 1] = '}';
+                               p[melen + 2] = '\0';
+                               oper = operbuf;
+                       }
+               }
+               sendto_one(client_p, ":%s BAN %s %s %s %lu %d %d %s :%s%s%s",
+                               me.id,
+                               type,
+                               aconf->user ? aconf->user : "*", aconf->host,
+                               (unsigned long)aconf->created,
+                               (int)(aconf->hold - aconf->created),
+                               (int)(aconf->lifetime - aconf->created),
+                               oper,
+                               aconf->passwd,
+                               aconf->spasswd ? "|" : "",
+                               aconf->spasswd ? aconf->spasswd : "");
+       }
+}
+
 /* burst_modes_TS6()
  *
  * input       - client to burst to, channel name, list to burst, mode flag
@@ -526,7 +588,7 @@ burst_TS6(struct Client *client_p)
                DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
                {
                        sendto_one(client_p, ":%s ENCAP * METADATA ADD %s %s :%s",
-                                  use_id(target_p), use_id(target_p), md->name, md->value);
+                                  use_id(&me), use_id(target_p), md->name, md->value);
                }
 
                if(ConfigFileEntry.burst_away && !EmptyString(target_p->user->away))
@@ -556,7 +618,7 @@ burst_TS6(struct Client *client_p)
                        msptr = uptr->data;
 
                        tlen = strlen(use_id(msptr->client_p)) + 1;
-                       if(is_owner(msptr))
+                       if(is_admin(msptr))
                                tlen++;
                        if(is_chanop(msptr))
                                tlen++;
@@ -587,12 +649,12 @@ burst_TS6(struct Client *client_p)
                }
                sendto_one(client_p, "%s", buf);
 
-               DICTIONARY_FOREACH(md, &iter, chptr->c_metadata)
+               DICTIONARY_FOREACH(md, &iter, chptr->metadata)
                {
                        /* don't bother bursting +J metadata */
                        if(!(md->name[0] == 'K'))
                                sendto_one(client_p, ":%s ENCAP * METADATA ADD %s %s :%s",
-                                          use_id(target_p), use_id(target_p), md->name, md->value);
+                                          use_id(&me), chptr->chname, md->name, md->value);
                }
 
                if(rb_dlink_list_length(&chptr->banlist) > 0)
@@ -616,6 +678,11 @@ burst_TS6(struct Client *client_p)
                                   ConfigChannel.burst_topicwho ? " " : "",
                                   chptr->topic);
 
+               if(IsCapable(client_p, CAP_MLOCK))
+                       sendto_one(client_p, ":%s MLOCK %ld %s :%s",
+                                  me.id, (long) chptr->channelts, chptr->chname,
+                                  EmptyString(chptr->mode_lock) ? "" : chptr->mode_lock);
+
                hchaninfo.chptr = chptr;
                call_hook(h_burst_channel, &hchaninfo);
        }
@@ -881,6 +948,9 @@ server_estab(struct Client *client_p)
                                        target_p->serv->fullcaps);
        }
 
+       if(IsCapable(client_p, CAP_BAN))
+               burst_ban(client_p);
+
        burst_TS6(client_p);
 
        /* Always send a PING after connect burst is done */