Fix crash if identify_service/identify_command were not specified in ircd.conf.

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

diff --git a/src/s_user.c b/src/s_user.c
index 441012c32f9a2adabe13f8f0886a1677a37a6253..080e1b440907540fc7babfbb054c356f230bc558 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 */
@@ -109,7 +109,7 @@ int user_modes[256] = {
        0,                      /* m */
        0,                      /* n */
        UMODE_OPER,             /* o */
-       0,                      /* p */
+       UMODE_OVERRIDE,         /* p */
        0,                      /* q */
        0,                      /* r */
        UMODE_SERVNOTICE,       /* s */
@@ -336,7 +336,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                }
 
                /* dont replace username if its supposed to be spoofed --fl */
-               if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->name, '@'))
+               if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@'))
                {
                        p = username;
 
@@ -655,8 +655,8 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 
        if(MyConnect(source_p) && source_p->localClient->passwd)
        {
-               if (ConfigFileEntry.identifyservice[0] != '\0' &&
-                               ConfigFileEntry.identifycommand[0] != '\0')
+               if (!EmptyString(ConfigFileEntry.identifyservice) &&
+                               !EmptyString(ConfigFileEntry.identifycommand))
                {
                        /* use user@server */
                        p = strchr(ConfigFileEntry.identifyservice, '@');
@@ -905,6 +905,15 @@ show_other_user_mode(struct Client *source_p, struct Client *target_p)
                                target_p->name, buf);
 }
 
+static void
+expire_umode_p(void *data)
+{
+       struct Client *source_p = data;
+       char *parv[4] = {source_p->name, source_p->name, "-p", NULL};
+       source_p->localClient->override_timeout_event = NULL;
+       user_mode(source_p, source_p, 3, parv);
+}
+
 /*
  * user_mode - set get current users mode
  *
@@ -1022,6 +1031,9 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
                                Count.oper--;
 
+                               user_metadata_delete(source_p, "OPERSTRING", 1);
+                               user_metadata_delete(source_p, "SWHOIS", 1);
+
                                if(MyConnect(source_p))
                                {
                                        source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
@@ -1138,6 +1150,12 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                source_p->umodes &= ~UMODE_ADMIN;
        }
 
+       if(MyConnect(source_p) && (source_p->umodes & UMODE_OVERRIDE) && (!IsOperOverride(source_p)))
+       {
+               sendto_one_notice(source_p, ":*** You need oper and the override flag for +p");
+               source_p->umodes &= ~UMODE_OVERRIDE;
+       }
+
        /* let modules providing usermodes know that we've changed our usermode --nenolod */
        hdata.client = source_p;
        hdata.oldumodes = setflags;
@@ -1157,6 +1175,19 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
                        construct_snobuf(source_p->snomask));
 
+               /* If we're setting +p, expire it, but only from local clients */
+               if(ConfigFileEntry.expire_override_time && MyClient(source_p) && (source_p->umodes & ~setflags) & UMODE_OVERRIDE)
+               {
+                       source_p->localClient->override_timeout_event =
+                               rb_event_addonce("expire_override", expire_umode_p, source_p, ConfigFileEntry.expire_override_time);
+               }
+               else if(MyClient(source_p) && source_p->localClient->override_timeout_event && (setflags & ~source_p->umodes) & UMODE_OVERRIDE)
+               {
+                       rb_event_delete(source_p->localClient->override_timeout_event);
+                       source_p->localClient->override_timeout_event = NULL;
+               }
+
+
        return (0);
 }
 
@@ -1304,6 +1335,32 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        else
                source_p->umodes |= DEFAULT_OPER_UMODES;
 
+       if(oper_p->swhois)
+               user_metadata_add(source_p, "SWHOIS", oper_p->swhois, 1);
+
+       if(oper_p->operstring)
+               user_metadata_add(source_p, "OPERSTRING", oper_p->operstring, 1);
+
+       if(oper_p->vhost || !EmptyString(GlobalSetOptions.operhost))
+       {
+               if(oper_p->vhost)
+                       change_nick_user_host(source_p, source_p->name, source_p->username, oper_p->vhost, 0, "Changing host");
+               else
+                       change_nick_user_host(source_p, source_p->name, source_p->username, GlobalSetOptions.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;
@@ -1464,6 +1521,13 @@ change_nick_user_host(struct Client *target_p,   const char *nick, const char *use
                        chptr = mscptr->chptr;
                        mptr = mode;
 
+                       if(is_admin(mscptr))
+                       {
+                               *mptr++ = 'a';
+                               strcat(modeval, nick);
+                               strcat(modeval, " ");
+                       }
+
                        if(is_chanop(mscptr))
                        {
                                *mptr++ = 'o';
@@ -1471,6 +1535,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';