X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/9f6bbe3cf9c786c5089bfd605315aed5268e8974..40c6b59b6340a6fc459020c64f5ee35a842a02c7:/src/blacklist.c

diff --git a/src/blacklist.c b/src/blacklist.c
index 50de9ad..fc355a8 100644
--- a/src/blacklist.c
+++ b/src/blacklist.c
@@ -78,9 +78,9 @@ static void blacklist_dns_callback(void *vptr, struct DNSReply *reply)
 
 	if (reply != NULL)
 	{
-		/* only accept 127.0.0.x as a listing */
+		/* only accept 127.x.y.z as a listing */
 		if (reply->addr.ss_family == AF_INET &&
-				!memcmp(&((struct sockaddr_in *)&reply->addr)->sin_addr, "\177\0\0", 3))
+				!memcmp(&((struct sockaddr_in *)&reply->addr)->sin_addr, "\177", 1))
 			listed = TRUE;
 		else if (blcptr->blacklist->lastwarning + 3600 < rb_current_time())
 		{
@@ -106,7 +106,7 @@ static void blacklist_dns_callback(void *vptr, struct DNSReply *reply)
 	if (rb_dlink_list_length(&blcptr->client_p->preClient->dnsbl_queries) == 0 && blcptr->client_p->flags & FLAGS_SENTUSER && !EmptyString(blcptr->client_p->name))
 	{
 		char buf[USERLEN + 1];
-		strlcpy(buf, blcptr->client_p->username, sizeof buf);
+		rb_strlcpy(buf, blcptr->client_p->username, sizeof buf);
 		register_local_user(blcptr->client_p, blcptr->client_p, buf);
 	}
 
@@ -117,7 +117,7 @@ static void blacklist_dns_callback(void *vptr, struct DNSReply *reply)
 static void initiate_blacklist_dnsquery(struct Blacklist *blptr, struct Client *client_p)
 {
 	struct BlacklistClient *blcptr = rb_malloc(sizeof(struct BlacklistClient));
-	char buf[IRCD_BUFSIZE];
+	char buf[IRCD_RES_HOSTLEN + 1];
 	int ip[4];
 
 	blcptr->blacklist = blptr;
@@ -130,7 +130,7 @@ static void initiate_blacklist_dnsquery(struct Blacklist *blptr, struct Client *
 	sscanf(client_p->sockhost, "%d.%d.%d.%d", &ip[3], &ip[2], &ip[1], &ip[0]);
 
 	/* becomes 2.0.0.127.torbl.ahbl.org or whatever */
-	rb_snprintf(buf, IRCD_BUFSIZE, "%d.%d.%d.%d.%s", ip[0], ip[1], ip[2], ip[3], blptr->host);
+	rb_snprintf(buf, sizeof buf, "%d.%d.%d.%d.%s", ip[0], ip[1], ip[2], ip[3], blptr->host);
 
 	gethost_byname_type(buf, &blcptr->dns_query, T_A);
 
@@ -154,8 +154,8 @@ struct Blacklist *new_blacklist(char *name, char *reject_reason)
 	}
 	else
 		blptr->status &= ~CONF_ILLEGAL;
-	strlcpy(blptr->host, name, HOSTLEN);
-	strlcpy(blptr->reject_reason, reject_reason, IRCD_BUFSIZE);
+	rb_strlcpy(blptr->host, name, IRCD_RES_HOSTLEN + 1);
+	rb_strlcpy(blptr->reject_reason, reject_reason, IRCD_BUFSIZE);
 	blptr->lastwarning = 0;
 
 	return blptr;