X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/83251205659e33e5a21fc504db0e8495fabeed28..d3b22631c1a1258f658369629402b3625333f777:/src/parse.c

diff --git a/src/parse.c b/src/parse.c
index cebeec9..970ad7f 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -31,8 +31,7 @@
 #include "channel.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "logger.h"
@@ -509,7 +508,7 @@ cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Message for %s[%s] from %s",
 				     source_p->name, source_p->from->name,
-				     get_server_name(client_p, SHOW_IP));
+				     client_p->name);
 	}
 	else
 	{
@@ -519,7 +518,7 @@ cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
 				     source_p->username,
 				     source_p->host,
 				     source_p->from->name,
-				     get_server_name(client_p, SHOW_IP));
+				     client_p->name);
 	}
 }
 
@@ -534,7 +533,7 @@ remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 {
 	int slen = strlen(lsender);
 
-	/* meepfoo	is a nickname (KILL)
+	/* meepfoo	is a nickname (ignore)
 	 * #XXXXXXXX	is a UID (KILL)
 	 * #XX		is a SID (SQUIT)
 	 * meep.foo	is a server (SQUIT)
@@ -544,14 +543,14 @@ remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
 	{
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Unknown prefix (%s) from %s, Squitting %s",
-				     lbuffer, get_server_name(client_p, SHOW_IP), lsender);
+				     lbuffer, client_p->name, lsender);
 
 		sendto_one(client_p,
 			   ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
 			   get_id(&me, client_p), lsender, 
 			   lbuffer, client_p->name);
 	}
-	else
+	else if(IsDigit(lsender[0]))
 		sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)", 
 			   get_id(&me, client_p), lsender, me.name);
 }