X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/ae42901c540b413a5064dbec9a566627b3a2967b..7a509a687fbae852461639ab461a8d35c91ce97e:/modules/m_testline.c?ds=sidebyside

diff --git a/modules/m_testline.c b/modules/m_testline.c
index d6448aa..0bcba6e 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -39,8 +39,6 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "sprintf_irc.h"
-#include "reject.h"
 
 static int mo_testline(struct Client *, struct Client *, int, const char **);
 static int mo_testgecos(struct Client *, struct Client *, int, const char **);
@@ -120,12 +118,12 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	/* parses as an IP, check for a dline */
 	if((type = parse_netmask(host, (struct sockaddr *)&ip, &host_mask)) != HM_HOST)
 	{
-#ifdef IPV6
-		if(type == HM_IPV6)
-			aconf = find_dline((struct sockaddr *)&ip);
-		else
-#endif
-			aconf = find_dline((struct sockaddr *)&ip);
+#ifdef RB_IPV6
+		if(type == HM_IPV6)
+			aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
+		else
+#endif
+			aconf = find_dline((struct sockaddr *)&ip, AF_INET);
 
 		if(aconf && aconf->status & CONF_DLINE)
 		{
@@ -142,22 +140,22 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
 	if (username != NULL)
 	{
-		strlcpy(user_trunc, username, sizeof user_trunc);
-		strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
+		rb_strlcpy(user_trunc, username, sizeof user_trunc);
+		rb_strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
 	}
 	else
 	{
-		strlcpy(user_trunc, "dummy", sizeof user_trunc);
-		strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
+		rb_strlcpy(user_trunc, "dummy", sizeof user_trunc);
+		rb_strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
 	}
 	/* now look for a matching I/K/G */
 	if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
 				(type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
 				(type != HM_HOST) ? (
-#ifdef IPV6
+#ifdef RB_IPV6
 				 (type == HM_IPV6) ? AF_INET6 : 
 #endif
-				  AF_INET) : 0)))
+				  AF_INET) : 0, NULL)))
 	{
 		static char buf[HOSTLEN+USERLEN+2];
 
@@ -173,16 +171,6 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 				buf, aconf->passwd);
 			return 0;
 		}
-		else if(aconf->status & CONF_GLINE)
-		{
-			rb_snprintf(buf, sizeof(buf), "%s@%s",
-					aconf->user, aconf->host);
-			sendto_one(source_p, form_str(RPL_TESTLINE),
-				me.name, source_p->name,
-				'G', (long) ((aconf->hold - rb_current_time()) / 60),
-				buf, aconf->passwd);
-			return 0;
-		}
 	}
 
 	/* they asked us to check a nick, so hunt for resvs.. */
@@ -205,7 +193,8 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	if(aconf && aconf->status & CONF_CLIENT)
 	{
 		sendto_one_numeric(source_p, RPL_STATSILINE, form_str(RPL_STATSILINE),
-				aconf->name, show_iline_prefix(source_p, aconf, aconf->user),
+				aconf->name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+				show_iline_prefix(source_p, aconf, aconf->user),
 				aconf->host, aconf->port, aconf->className);
 		return 0;
 	}