]> jfr.im git - irc/rqf/shadowircd.git/blobdiff - src/s_user.c
Don't discard self-oppings from remote override opers.
[irc/rqf/shadowircd.git] / src / s_user.c
index 062b0ed12efd61207de82194750c7b1ebb3f4e1e..d5f163d0fdcfb31588d1ec1c0c1ba68434085d21 100644 (file)
@@ -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
  *
@@ -1163,6 +1172,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);
 }
 
@@ -1310,9 +1332,12 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        else
                source_p->umodes |= DEFAULT_OPER_UMODES;
 
-       if(!EmptyString(ConfigFileEntry.default_operhost))
+       if(oper_p->vhost || !EmptyString(ConfigFileEntry.default_operhost))
        {
-               change_nick_user_host(source_p, source_p->name, source_p->username, ConfigFileEntry.default_operhost, 0, "Changing host");
+               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, 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);