X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/cc200171d7c40be3b204460f9c14d5d37e771866..51f73b614b630372738484440a9b29895d90eddd:/modules/m_scan.c

diff --git a/modules/m_scan.c b/modules/m_scan.c
index 37a0783..7f47187 100644
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -38,7 +38,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
@@ -79,7 +79,6 @@ static const char *spoofed_sockhost = "0";
 
 /*
  * m_scan
- *      parv[0] = sender prefix
  *      parv[1] = options [or target]
  *	parv[2] = [target]
  */
@@ -135,6 +134,12 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
 		return -1;
 	}
 
+	if (parv[2][0] != '+' && parv[2][0] != '-')
+	{
+		sendto_one_notice(source_p, ":SCAN UMODES: umodes parameter must start with '+' or '-'");
+		return -1;
+	}
+
 	for (c = parv[2]; *c; c++)
 	{
 		switch(*c)
@@ -170,19 +175,29 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
 				list_max = atoi(parv[++i]);
 			else if (!irccmp(parv[i], "mask"))
 				mask = parv[++i];
+			else
+			{
+				sendto_one_notice(source_p, ":SCAN UMODES: invalid parameters");
+				return -1;
+			}
+		}
+		else
+		{
+			sendto_one_notice(source_p, ":SCAN UMODES: invalid parameters");
+			return -1;
 		}
 	}
-	if (target_list == &global_client_list && (list_users || mask))
+	if (target_list == &global_client_list && list_users)
 	{
 		if (IsOperSpy(source_p))
 		{
 			if (!ConfigFileEntry.operspy_dont_care_user_info)
 			{
-				strlcpy(buf, "UMODES", sizeof buf);
+				rb_strlcpy(buf, "UMODES", sizeof buf);
 				for (i = 2; i < parc; i++)
 				{
-					strlcat(buf, " ", sizeof buf);
-					strlcat(buf, parv[i], sizeof buf);
+					rb_strlcat(buf, " ", sizeof buf);
+					rb_strlcat(buf, parv[i], sizeof buf);
 				}
 				report_operspy(source_p, "SCAN", buf);
 			}