X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..fc579e36e7201b9fcedf1f44f6d8746aa7fe1918:/modules/m_scan.c?ds=sidebyside

diff --git a/modules/m_scan.c b/modules/m_scan.c
index 7fdb688..28154d8 100644
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -28,7 +28,6 @@
  *  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: m_scan.c 1853 2006-08-24 18:30:52Z jilles $
  */
 
 #include "stdinc.h"
@@ -38,10 +37,9 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h"
@@ -80,7 +78,6 @@ static const char *spoofed_sockhost = "0";
 
 /*
  * m_scan
- *      parv[0] = sender prefix
  *      parv[1] = options [or target]
  *	parv[2] = [target]
  */
@@ -116,13 +113,13 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
 	int what = MODE_ADD;
 	int mode;
 	int list_users = YES;
-	int list_max = 0;
+	int list_max = 500;
 	int list_count = 0, count = 0;
 	const char *mask = NULL;
 	const char *c;
 	struct Client *target_p;
-	dlink_list *target_list = &lclient_list;	/* local clients only by default */
-	dlink_node *tn;
+	rb_dlink_list *target_list = &lclient_list;	/* local clients only by default */
+	rb_dlink_node *tn;
 	int i;
 	const char *sockhost;
 	char buf[512];
@@ -136,6 +133,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)
@@ -171,19 +174,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);
 			}
@@ -196,7 +209,7 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
 		}
 	}
 
-	DLINK_FOREACH(tn, target_list->head)
+	RB_DLINK_FOREACH(tn, target_list->head)
 	{
 		unsigned int working_umodes = 0;
 		char maskbuf[BUFSIZE];
@@ -225,7 +238,7 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
 
 		if (mask != NULL)
 		{
-			ircsnprintf(maskbuf, BUFSIZE, "%s!%s@%s",
+			rb_snprintf(maskbuf, BUFSIZE, "%s!%s@%s",
 				target_p->name, target_p->username, target_p->host);
 
 			if (!match(mask, maskbuf))