@@ -45,6 +45,7 @@ Nicholas M. Kirsch <nick*kirsch.org>

 Robbert Kouprie <robbert*exx.nl>

 Thomas Lamy <Thomas.Lamy*in-online.net>

 Peter N Lewis <peter*stairways.com.au>

+David S. Madole <david*madole.net>

 Mark Mielke <mark*mark.mielke.cc>

 Arkadiusz Miskiewicz <misiek*pld.org.pl>

 Hendrik Muhs <Hendrik.Muhs*student.uni-magdeburg.de>

@@ -1,3 +1,9 @@

+Sat Dec  6 00:43:08 CET 2003 (tk)

+---------------------------------

+  * Applied a patch from David S. Madole <david*madole.net>:

+    + clamd: accept a hostname for the "TCPAddr" parameter

+    + clamdscan: use the "TCPAddr" parameter

+

 Fri Dec  5 19:16:08 GMT 2003 (njh)

 ----------------------------------

   * clamav-milter: Added call to umask to ensure that the local socket

@@ -24,6 +24,7 @@

 #include <arpa/inet.h>

 #include <clamav.h>

 #include <errno.h>

+#include <netdb.h>

 #include "options.h"

@@ -38,6 +39,7 @@ int tcpserver(const struct optstruct *opt, const struct cfgstruct *copt, struct

 	int sockfd, backlog;

 	struct cfgstruct *cpt;

 	struct cfgstruct *taddr;

+	struct hostent *he;

 	char *estr;

 	int true = 1;

@@ -46,13 +48,14 @@ int tcpserver(const struct optstruct *opt, const struct cfgstruct *copt, struct

     server.sin_port = htons(cfgopt(copt, "TCPSocket")->numarg);

-    if((taddr = cfgopt(copt, "TCPAddr")))

-    {

-	server.sin_addr.s_addr = inet_addr( taddr->strarg );

-    }else

-    {

+    if((taddr = cfgopt(copt, "TCPAddr"))) {

+	if ((he = gethostbyname(taddr->strarg)) == 0) {

+	    logg("!gethostbyname(%s) error: %s\n", taddr->strarg, strerror(errno));

+	    exit(1);

+	}

+	server.sin_addr = *(struct in_addr *) he->h_addr_list[0];

+    } else

 	server.sin_addr.s_addr = INADDR_ANY;

-    }

     if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {

@@ -23,6 +23,7 @@

 #include <sys/un.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

+#include <netdb.h>

 #include "others.h"

 #include "cfgfile.h"

@@ -34,6 +35,7 @@ int client(const struct optstruct *opt)

 	char buff[4096], cwd[200], *file, *scancmd, *pt;

 	struct sockaddr_un server;

         struct sockaddr_in server2;

+	struct hostent *he;

 	struct cfgstruct *copt, *cpt;

 	int sockd, wsockd, loopw = 60, bread, port;

 	const char *clamav_conf = getargl(opt, "config-file");

@@ -87,9 +89,19 @@ int client(const struct optstruct *opt)

 	}

 	server2.sin_family = AF_INET;

-	server2.sin_addr.s_addr = inet_addr("127.0.0.1");

 	server2.sin_port = htons(cpt->numarg);

+	if((cpt = cfgopt(copt, "TCPAddr"))) {

+	    if ((he = gethostbyname(cpt->strarg)) == 0) {

+		close(sockd);

+		perror("gethostbyname()");

+		mprintf("@Can't lookup clamd hostname.\n");

+		return 2;

+	    }

+	    server2.sin_addr = *(struct in_addr *) he->h_addr_list[0];

+

+	} else server2.sin_addr.s_addr = inet_addr("127.0.0.1");

+

 	if(connect(sockd, (struct sockaddr *) &server2, sizeof(struct sockaddr_in)) < 0) {

 	    close(sockd);

 	    perror("connect()");