Update comments for parv[0] removal.

[solanum.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 6c81df8ea5e81bc95c25accb3807445b11447731..7ba25c34a26d4b859e8737ac155d36a7e1bbce5e 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -314,6 +314,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                return (CLIENT_EXITED);
        }
 
+       if(IsConfSSLNeeded(aconf) && !IsSSL(source_p))
+       {
+               ServerStats.is_ref++;
+               sendto_one_notice(source_p, ":*** Notice -- You need to use SSL/TLS to use this server");
+               exit_client(client_p, source_p, &me, "Use SSL/TLS");
+               return (CLIENT_EXITED);
+       }
+
        if(!IsGotId(source_p))
        {
                const char *p;
@@ -794,63 +802,86 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
        /* If this user is being spoofed, tell them so */
        if(IsConfDoSpoofIp(aconf))
        {
-               sendto_one_notice(source_p, ":*** Spoofing your IP. congrats.");
+               sendto_one_notice(source_p, ":*** Spoofing your IP");
        }
 
        /* If this user is in the exception class, Set it "E lined" */
        if(IsConfExemptKline(aconf))
        {
                SetExemptKline(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from K/X lines. congrats.");
+               sendto_one_notice(source_p, ":*** You are exempt from K/X lines");
        }
 
        if(IsConfExemptDNSBL(aconf))
                /* kline exempt implies this, don't send both */
                if(!IsConfExemptKline(aconf))
-                       sendto_one_notice(source_p, ":*** You are exempt from DNS blacklists.");
+                       sendto_one_notice(source_p, ":*** You are exempt from DNS blacklists");
 
        /* If this user is exempt from user limits set it F lined" */
        if(IsConfExemptLimits(aconf))
        {
-               sendto_one_notice(source_p, ":*** You are exempt from user limits. congrats.");
+               sendto_one_notice(source_p, ":*** You are exempt from user limits");
        }
 
        if(IsConfExemptFlood(aconf))
        {
                SetExemptFlood(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from flood limits.");
+               sendto_one_notice(source_p, ":*** You are exempt from flood limits");
        }
 
        if(IsConfExemptSpambot(aconf))
        {
                SetExemptSpambot(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from spambot checks.");
+               sendto_one_notice(source_p, ":*** You are exempt from spambot checks");
        }
 
        if(IsConfExemptJupe(aconf))
        {
                SetExemptJupe(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from juped channel warnings.");
+               sendto_one_notice(source_p, ":*** You are exempt from juped channel warnings");
        }
 
        if(IsConfExemptResv(aconf))
        {
                SetExemptResv(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from resvs.");
+               sendto_one_notice(source_p, ":*** You are exempt from resvs");
        }
 
        if(IsConfExemptShide(aconf))
        {
                SetExemptShide(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from serverhiding.");
+               sendto_one_notice(source_p, ":*** You are exempt from serverhiding");
        }
 }
 
+static void
+show_other_user_mode(struct Client *source_p, struct Client *target_p)
+{
+       int i;
+       char buf[BUFSIZE];
+       char *m;
+
+       m = buf;
+       *m++ = '+';
+
+       for (i = 0; i < 128; i++) /* >= 127 is extended ascii */
+               if (target_p->umodes & user_modes[i])
+                       *m++ = (char) i;
+       *m = '\0';
+
+       if (MyConnect(target_p) && target_p->snomask != 0)
+               sendto_one_notice(source_p, ":Modes for %s are %s %s",
+                               target_p->name, buf,
+                               construct_snobuf(target_p->snomask));
+       else
+               sendto_one_notice(source_p, ":Modes for %s are %s",
+                               target_p->name, buf);
+}
+
 /*
  * user_mode - set get current users mode
  *
  * m_umode() added 15/10/91 By Darren Reed.
- * parv[0] - sender
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  */
@@ -896,9 +927,12 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
        }
 
-       if(source_p != target_p || target_p->from != source_p->from)
+       if(source_p != target_p)
        {
-               sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name);
+               if (MyOper(source_p) && parc < 3)
+                       show_other_user_mode(source_p, target_p);
+               else
+                       sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name);
                return 0;
        }