--- sbbs/src/sbbs3/mxlookup.c	2018/04/24 16:41:23	1.1
+++ sbbs/src/sbbs3/mxlookup.c	2018/04/24 16:43:45	1.1.1.2
@@ -2,7 +2,7 @@
 
 /* Synchronet DNS MX-record lookup routines */
 
-/* $Id: mxlookup.c,v 1.1 2018/04/24 16:41:23 root Exp $ */
+/* $Id: mxlookup.c,v 1.1.1.2 2018/04/24 16:43:45 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
@@ -342,7 +342,7 @@ int dns_getmx(char* name, char* mx, char
 		answers=ntohs(msghdr.ancount);
 		p=msg+len;	/* Skip the header and question portion */
 
-		for(i=0;i<answers;i++) {
+		for(i=0;i<answers && p<msg+sizeof(msg);i++) {
 			namelen=0;
 			p+=dns_name(hostname, &namelen, sizeof(hostname)-1, msg+offset, p);
 
@@ -391,31 +391,41 @@ void main(int argc, char **argv)
 {
 	char		mx[128],mx2[128];
 	int			result;
+	DWORD		bindaddr=0;
+#ifdef _WIN32
 	WSADATA		WSAData;
+#endif
 
 	printf("sizeof(dns_msghdr_t)=%d\n",sizeof(dns_msghdr_t));
 	printf("sizeof(dns_query_t)=%d\n",sizeof(dns_query_t));
 	printf("sizeof(dns_rr_t)=%d\n",sizeof(dns_rr_t));
 
 	if(argc<3) {
-		printf("usage: mxlookup hostname dns\n");
+		printf("usage: mxlookup hostname dns [bindaddr]\n");
 		return;
 	}
 
 
+#ifdef _WIN32
     if((result = WSAStartup(MAKEWORD(1,1), &WSAData))!=0) {
 		printf("Error %d in WSAStartup",result);
 		return;
 	}
+#endif
 
-	if((result=dns_getmx(argv[1],mx,mx2,0,inet_addr(argv[2]),FALSE,60))!=0) 
+	if(argc > 3)
+		bindaddr=ntohl(inet_addr(argv[3]));
+
+	if((result=dns_getmx(argv[1],mx,mx2,bindaddr,inet_addr(argv[2]),FALSE,60))!=0) 
 		printf("Error %d getting mx record\n",result);
 	else {
 		printf("MX1: %s\n",mx);
 		printf("MX2: %s\n",mx2);
 	}
 
+#ifdef _WIN32
 	WSACleanup();
+#endif
 	gets(mx);
 }
 #endif