Do not log ERROR messages from unknowns.

[solanum.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index d2b58a35d5e5135c0855331e3c2103dba4d69a88..f9984f40c1828a3c67e5144301a6c7a1f3d479fd 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -809,7 +809,7 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
        if(IsConfExemptKline(aconf))
        {
                SetExemptKline(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from K/X");
+               sendto_one_notice(source_p, ":*** You are exempt from K/X lines");
        }
 
        if(IsConfExemptDNSBL(aconf))
@@ -854,6 +854,30 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
        }
 }
 
+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
  *
@@ -904,9 +928,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;
        }