@@ -1,3 +1,8 @@

+Sat Oct 11 11:56:10 CEST 2008 (acab)

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

+  * Make use of address family instead of protocol family as the

+    latter gets broken by _XOPEN_SOURCE

+

 Fri Oct 10 16:38:45 CEST 2008 (tk)

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

   * freshclam: add support for submitting detection statistics (bb#777)

@@ -1192,7 +1192,7 @@ main(int argc, char **argv)

 	if(Bflag) {

 		int on;

-		broadcastSock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);

+		broadcastSock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);

 		/*

 		 * SO_BROADCAST doesn't sent to all NICs on Linux, it only

 		 * broadcasts on eth0, which is why there's an optional argument

@@ -50,11 +50,7 @@

 #include "client.h"

 #include "clamd_fdscan.h"

-#ifdef PF_INET

-# define SOCKET_INET	PF_INET

-#else

-# define SOCKET_INET	AF_INET

-#endif

+#define SOCKET_INET	AF_INET

 void move_infected(const char *filename, const struct optstruct *opt);

 int notremoved = 0, notmoved = 0;

@@ -118,15 +118,10 @@ static int getclientsock(const char *localip, int prot)

 {

 	int socketfd = -1;

-#ifdef HAVE_GETADDRINFO

-    if(prot == PF_INET6)

-	socketfd = socket(PF_INET6, SOCK_STREAM, 0);

+    if(prot == AF_INET6)

+	socketfd = socket(AF_INET6, SOCK_STREAM, 0);

     else

-	socketfd = socket(PF_INET, SOCK_STREAM, 0);

-#else

-    socketfd = socket(PF_INET, SOCK_STREAM, 0);

-#endif

-

+	socketfd = socket(AF_INET, SOCK_STREAM, 0);

     if(socketfd < 0) {

 	logg("!Can't create new socket\n");

 	return -1;

@@ -147,11 +147,7 @@ int notify(const char *cfgfile)

 #else /* IPv4 */

-#ifdef PF_INET

-	if((sockd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {

-#else

 	if((sockd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

-#endif

 	    logg("^Clamd was NOT notified: Can't create TCP socket\n");

 	    perror("socket()");

 	    freecfg(copt);

@@ -297,11 +297,7 @@ static char *getdsig(const char *host, const char *user, const unsigned char *da

 	mprintf("\n");

     }

-#ifdef PF_INET

-    if((sockd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {

-#else

     if((sockd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

-#endif

 	perror("socket()");

 	mprintf("!getdsig: Can't create socket\n");

 	memset(pass, 0, sizeof(pass));