X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/d7cff1d11ba8b6a5eb393911b8edda125b2f9bbb..d25c6eb1b223d1a0993dde9a28c97ef95e54bceb:/src/parse.c

diff --git a/src/parse.c b/src/parse.c
index 5fe0585..c4f4c21 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -50,7 +50,7 @@ struct Dictionary *alias_dict = NULL;
  */
 static char *sender;
 
-/* parv[0] == source, and parv[LAST] == NULL */
+/* parv[0] is not used, and parv[LAST] == NULL */
 static char *para[MAXPARA + 2];
 
 static void cancel_clients(struct Client *, struct Client *, char *);
@@ -104,7 +104,7 @@ string_to_array(char *string, char **parv)
 		if(*buf == '\0')
 			return x;
 	}
-	/* we can go upto parv[MAXPARA], as parv[0] is taken by source */
+	/* we can go upto parv[MAXPARA], as parv[0] is skipped */
 	while (x < MAXPARA);
 
 	if(*p == ':')
@@ -131,7 +131,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 	struct Message *mptr;
 
 	s_assert(MyConnect(client_p));
-	s_assert(client_p->localClient->F->fd >= 0);
+	s_assert(client_p->localClient->F != NULL);
 	if(IsAnyDead(client_p))
 		return;
 
@@ -532,6 +532,8 @@ static void
 remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 {
 	int slen = strlen(lsender);
+	char sid[4];
+	struct Client *server;
 
 	/* meepfoo	is a nickname (ignore)
 	 * #XXXXXXXX	is a UID (KILL)
@@ -550,9 +552,21 @@ remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 			   get_id(&me, client_p), lsender, 
 			   lbuffer, client_p->name);
 	}
-	else if(IsDigit(lsender[0]))
-		sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)", 
-			   get_id(&me, client_p), lsender, me.name);
+	else if(!IsDigit(lsender[0]))
+		;
+	else if(slen != 9)
+		sendto_realops_snomask(SNO_DEBUG, L_ALL,
+				     "Invalid prefix (%s) from %s",
+				     lbuffer, client_p->name);
+	else
+	{
+		memcpy(sid, lsender, 3);
+		sid[3] = '\0';
+		server = find_server(NULL, sid);
+		if (server != NULL && server->from == client_p)
+			sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)", 
+					get_id(&me, client_p), lsender, me.name);
+	}
 }
 
 
@@ -560,7 +574,6 @@ remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 /*
  *
  *      parc    number of arguments ('sender' counted as one!)
- *      parv[0] pointer to 'sender' (may point to empty string) (not used)
  *      parv[1]..parv[parc-1]
  *              pointers to additional parameters, this is a NULL
  *              terminated list (parv[parc] == NULL).