X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/e7c8892297beaacafd755b2b3a70140a66cf9bfc..9d393c9052eed3ccdc83f6b9fe75fd7d258ced57:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 667873e..71c9b8d 100644
--- 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
  */
@@ -904,9 +935,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;
 	}