--- rblcheck.c.orig	Thu Aug 20 00:47:03 1998

+++ rblcheck.c	Mon Jul 16 16:40:55 2001

@@ -79,8 +79,10 @@

 #include <sys/types.h>

 #include <netinet/in.h>

 #include <arpa/nameser.h>

+#include <arpa/inet.h>

 #include <resolv.h>

 #include <netdb.h>

+#include <unistd.h>

 #define VERSION "1.4"

@@ -203,7 +205,7 @@

  * domain. If "txt" is non-zero, we perform a TXT record lookup. We

  * return the text returned from a TXT match, or an empty string, on

  * a successful match, or NULL on an unsuccessful match. */

-char * rblcheck( int a, int b, int c, int d, char * rbldomain, int txt )

+char * rblcheck( struct in_addr a, char * rbldomain, int txt )

 {

 	char * domain;

 	char * result = NULL;

@@ -214,12 +216,15 @@

 	const u_char * cend;

 	const u_char * rend;

 	int len;

+	u_char *p;

+	int i, j;

 	/* 16 characters max in a dotted-quad address, plus 1 for null */

 	domain = ( char * )malloc( 17 + strlen( rbldomain ) );

+	p = (u_char *)&a;

 	/* Create a domain name, in reverse. */

-	sprintf( domain, "%d.%d.%d.%d.%s", d, c, b, a, rbldomain );

+	sprintf( domain, "%d.%d.%d.%d.%s", p[3], p[2], p[1], p[0], rbldomain );

 	/* Make our DNS query. */

 	res_init();

@@ -261,8 +266,8 @@

 	cp = answer + sizeof( HEADER );

 	while( *cp != '\0' )

 	{

-		a = *cp++;

-		while( a-- )

+		i = *cp++;

+		while( i-- )

 			cp++;

 	}

@@ -277,8 +282,8 @@

 	cp += ( NS_INT16SZ * 2 ) + NS_INT32SZ;

 	/* Get the length and end of the buffer. */

-	NS_GET16( c, cp );

-	cend = cp + c;

+	NS_GET16( i, cp );

+	cend = cp + i;

 	/* Iterate over any multiple answers we might have. In

 	   this context, it's unlikely, but anyway. */

@@ -286,10 +291,10 @@

 	rend = result + RESULT_SIZE - 1;

 	while( cp < cend && rp < rend )

 	{

-		a = *cp++;

-		if( a != 0 )

-			for( b = a; b > 0 && cp < cend && rp < rend;

-			  b-- )

+		i = *cp++;

+		if( i != 0 )

+			for( j = i; j > 0 && cp < cend && rp < rend;

+			  j-- )

 			{

 				if( *cp == '\n' || *cp == '"' ||

 				  *cp == '\\' )

@@ -308,23 +313,27 @@

 	char **argv;

 {

 	extern int optind;

-	int a, b, c, d;

+	extern char *optarg;

+	struct hostent *ent;

+	struct in_addr a;

 	int quiet = 0;

 	int txt = 0;

 	int rblfiltered = 0;

 	char * response;

 	struct rbl * rblsites = NULL;

 	struct rbl * ptr;

+	int fail;

+	int c;

-	/* Add more sites you want in the default list of RBL-alike

-	   systems here. ### An easier way to change this is needed. ### */

-	rblsites = togglesite( "rbl.maps.vix.com", rblsites );

-	rblsites = togglesite( "rbl.dorkslayers.com", rblsites );

+/* Hack to handle the easy addition of sites at compile time */

+#define SITE(x) rblsites = togglesite( (x), rblsites);

+#include "rblsites.h"

+#undef SITE

 	progname = argv[ 0 ];

-	while( ( a = getopt( argc, argv, "qtls:c?hv" ) ) != EOF )

-		switch( a )

+	while( ( c = getopt( argc, argv, "qtls:c?hv" ) ) != EOF )

+		switch( c )

 		{

 			case 'q':

 				/* Quiet */

@@ -372,10 +381,23 @@

 		return -1;

 	}

-	if( sscanf( argv[ optind ], "%d.%d.%d.%d", &a, &b, &c, &d ) != 4 ||

-	  a < 0 || a > 255 || b < 0 || b > 255 || c < 0 || c > 255 ||

-	  d < 0 || d > 255 )

-	{

+	fail = 0;

+	if ((ent = gethostbyname(argv[optind])) != NULL) {

+		memcpy(&a, ent->h_addr_list[0], sizeof(a));

+		if (ent->h_addr_list[1]) {

+			if (!quiet)

+				fprintf(stderr,

+				    "%s resolved to mutiple addresses: ",

+				    argv[optind]);

+		}

+		if (!quiet)

+			fprintf(stderr, "checking %s\n", inet_ntoa(a));

+	} else {

+		if (!inet_aton(argv[optind], &a))

+			fail++;

+	}

+

+	if (fail) {

 		fprintf( stderr, "%s: invalid IP address\n", progname );

 		usage();	

 		return -1;

@@ -383,7 +405,7 @@

 	for( ptr = rblsites; ptr != NULL; ptr = ptr->next )

 	{

-		response = rblcheck( a, b, c, d, ptr->site, txt );

+		response = rblcheck( a, ptr->site, txt );

 		printf( "%s%s%s%s%s%s", !quiet && !response ? "not " : "",

 		  !quiet ? "RBL filtered by " : "", !quiet ? ptr->site : "",

 		  txt && response && strlen( response ) && !quiet ? ": " : "",

--- Makefile.orig	Thu Aug 20 01:47:03 1998

+++ Makefile	Wed Nov  4 15:56:48 1998

@@ -41,4 +41,3 @@

 # below for an entry for your system.

-CC=gcc

-CFLAGS=-O -Wall

+CFLAGS+=-Wall

 LDFLAGS=-s

#!/bin/sh

# $FreeBSD: ports/mail/rblcheck/scripts/configure.rbl,v 1.4 2001/08/24 16:08:10 dwcjr Exp $

if [ -f ${WRKSRC}/rblsites.h ]; then

	exit

fi

tempfile=`mktemp -t checklist`

SET_MAPS_RBL="OFF"

SET_MAPS_DUL="OFF"

SET_MAPS_RSS="OFF"

SET_ORBL="OFF"

SET_ORBZ="OFF"

SET_ORBZ_MAN="OFF"

SET_ORDB="OFF"

TODAY=`date "+%Y%m%d"`

if [ "${BATCH}" ]; then

	# MAPS is changing to a subscription service on 20010731

	if [ ${TODAY} -lt 20010801 ]; then

		OPTIONS="\"MAPS_RBL\" \"MAPS_DUL\" \"MAPS_RSS\""

	else

		OPTIONS="\"ORBZ\""

	fi

	if [ "x${OPTIONS}" != "x" ]; then

		set ${OPTIONS}

	fi

else

	# MAPS is changing to a subscription service on 20010731

	if [ ${TODAY} -lt 20010801 ]; then

		SET_MAPS_RBL="ON"

		SET_MAPS_DUL="ON"

		SET_MAPS_RSS="ON"

	else

		SET_ORBZ="ON"

	fi

	/usr/bin/dialog --title "RBL Sites" --clear \

		--checklist "\n\

Please select desired options:" -1 -1 16 \

MAPS_RBL	"MAPS Blackhole list   www.mail-abuse.org" ${SET_MAPS_RBL} \

MAPS_DUL	"MAPS DialUp List      www.mail-abuse.org" ${SET_MAPS_DUL} \

MAPS_RSS	"MAPS Open Relay list  www.mail-abuse.org" ${SET_MAPS_RSS} \

ORBL		"ORBL Open Relay list  www.orbl.org" ${SET_ORBL} \

ORBZ		"ORBZ Open Relay list  orbz.gst-group.co.uk" ${SET_ORBZ} \

ORBZ_MAN	"ORBZ Manual list      orbz.gst-group.co.uk" ${SET_ORBZ_MAN} \

ORDB		"ORDB Open Relay list  www.ordb.org" ${SET_ORDB} \

2> $tempfile

	retval=$?

	if [ -s $tempfile ]; then

		set `cat $tempfile`

	fi

	rm -f $tempfile

	case $retval in

		0)	if [ -z "$*" ]; then

				echo "Nothing selected"

			fi

			;;

		1)	echo "Cancel pressed."

			exit 1

			;;

	esac

fi

exec > ${WRKSRC}/rblsites.h

while [ "$1" ]; do

	case $1 in

		\"MAPS_RBL\")

			echo "SITE(\"blackholes.mail-abuse.org\")"

			;;

		\"MAPS_DUL\")

			echo "SITE(\"dialups.mail-abuse.org\")"

			;;

		\"MAPS_RSS\")

			echo "SITE(\"relays.mail-abuse.org\")"

			;;

		\"ORBL\")

			echo "SITE(\"or.orbl.org\")"

			;;

		\"ORBZ\")

			echo "SITE(\"orbz.gst-group.co.uk\")"

			;;

		\"ORBZ_MAN\")

			echo "SITE(\"manual.orbz.gst-group.co.uk\")"

			;;

		\"ORDB\")

			echo "SITE(\"relays.ordb.org\")"

			;;

		*)

			echo "Invalid option(s): $*" > /dev/stderr

			rm -f ${WRKSRC}/rblsites.h

			exit 1

			;;

	esac

	shift

done