Yay for documenting code....

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

diff --git a/src/s_user.c b/src/s_user.c
index 04b1838d90e841086946e7f9b3d573997b1f8f49..c315565ddd3bcd22e6509806b1a7348fd859e26c 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -1031,8 +1031,6 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
                                Count.oper--;
 
-                               /* Do we need to propegate these? I'm not 100% sure
-                                * so we should test it when we have a testnet */
                                user_metadata_delete(source_p, "OPERSTRING", 1);
                                user_metadata_delete(source_p, "SWHOIS", 1);
 
@@ -1337,6 +1335,12 @@ 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(ConfigFileEntry.default_operhost))
        {
                if(oper_p->vhost)
@@ -1517,7 +1521,7 @@ change_nick_user_host(struct Client *target_p,    const char *nick, const char *use
                        chptr = mscptr->chptr;
                        mptr = mode;
 
-                       if(is_owner(mscptr))
+                       if(is_admin(mscptr))
                        {
                                *mptr++ = 'a';
                                strcat(modeval, nick);