Fix crashes when there are no alias blocks in the conf.

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

diff --git a/src/s_user.c b/src/s_user.c
index ca5f74ce8de8a3b342fd79fdaf58979bdf2ab3bf..862e9c71adefde9d5900031ecd36dc863135615b 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -712,7 +712,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 int
 valid_hostname(const char *hostname)
 {
-       const char *p = hostname;
+       const char *p = hostname, *last_slash = 0;
        int found_sep = 0;
 
        s_assert(NULL != p);
@@ -720,7 +720,7 @@ valid_hostname(const char *hostname)
        if(hostname == NULL)
                return NO;
 
-       if('.' == *p || ':' == *p)
+       if('.' == *p || ':' == *p || '/' == *p)
                return NO;
 
        while (*p)
@@ -729,13 +729,21 @@ valid_hostname(const char *hostname)
                        return NO;
                 if(*p == '.' || *p == ':')
                        found_sep++;
+               else if(*p == '/')
+               {
+                       found_sep++;
+                       last_slash = p;
+               }
                p++;
        }
 
        if(found_sep == 0)
-               return(NO);
+               return NO;
+
+       if(last_slash && IsDigit(last_slash[1]))
+               return NO;
 
-       return (YES);
+       return YES;
 }
 
 /* 
@@ -854,11 +862,34 @@ 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
  *
  * m_umode() added 15/10/91 By Darren Reed.
- * parv[0] - sender
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  */
@@ -906,7 +937,10 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
        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;
        }
 
@@ -1287,7 +1321,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        call_hook(h_umode_changed, &hdata);
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                            "%s (%s@%s) is now an operator", source_p->name,
+                            "%s (%s!%s@%s) is now an operator", oper_p->name, source_p->name,
                             source_p->username, source_p->host);
        if(!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
                ++Count.invisi;