presence: Add _butone() variant of sendto_common_channels_local_with_capability().

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

diff --git a/src/s_user.c b/src/s_user.c
index f9984f40c1828a3c67e5144301a6c7a1f3d479fd..71c9b8d32ff4a5c42d7be4b6bb33877fed488b91 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;
 
-       return (YES);
+       if(last_slash && IsDigit(last_slash[1]))
+               return NO;
+
+       return YES;
 }
 
 /* 
@@ -882,7 +890,6 @@ show_other_user_mode(struct Client *source_p, struct Client *target_p)
  * 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
  */