Make KICK and INVITE send snotes on override.

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

diff --git a/src/s_user.c b/src/s_user.c
index fccd29d6a728955cb31bc94cc81d65cea8099e70..062b0ed12efd61207de82194750c7b1ebb3f4e1e 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -73,7 +73,7 @@ int user_modes[256] = {
        UMODE_DEAF,             /* D */
        0,                      /* E */
        0,                      /* F */
-       0,                      /* G */
+       UMODE_SCALLERID,        /* G */
        0,                      /* H */
        0,                      /* I */
        0,                      /* J */
@@ -1310,6 +1310,23 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        else
                source_p->umodes |= DEFAULT_OPER_UMODES;
 
+       if(!EmptyString(ConfigFileEntry.default_operhost))
+       {
+               change_nick_user_host(source_p, source_p->name, source_p->username, ConfigFileEntry.default_operhost, 0, "Changing host");
+               
+               sendto_one_numeric(source_p, RPL_HOSTHIDDEN, "%s :is now your hidden host (set by %s)", source_p->host, source_p->servptr->name);
+
+               sendto_server(NULL, NULL,
+                       CAP_EUID | CAP_TS6, NOCAPS, ":%s CHGHOST %s :%s",
+                       use_id(&me), use_id(source_p), source_p->host);
+               sendto_server(NULL, NULL,
+                       CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
+                       use_id(&me), use_id(source_p), source_p->host);
+
+               if (!IsDynSpoof(source_p))
+                       SetDynSpoof(source_p);
+       }
+
        if (oper_p->snomask)
        {
                source_p->snomask |= oper_p->snomask;
@@ -1470,6 +1487,13 @@ change_nick_user_host(struct Client *target_p,   const char *nick, const char *use
                        chptr = mscptr->chptr;
                        mptr = mode;
 
+                       if(is_owner(mscptr))
+                       {
+                               *mptr++ = 'a';
+                               strcat(modeval, nick);
+                               strcat(modeval, " ");
+                       }
+
                        if(is_chanop(mscptr))
                        {
                                *mptr++ = 'o';
@@ -1477,6 +1501,13 @@ change_nick_user_host(struct Client *target_p,   const char *nick, const char *use
                                strcat(modeval, " ");
                        }
 
+                       if(is_halfop(mscptr))
+                       {
+                               *mptr++ = 'h';
+                               strcat(modeval, nick);
+                               strcat(modeval, " ");
+                       }
+
                        if(is_voiced(mscptr))
                        {
                                *mptr++ = 'v';