@@ -1,3 +1,7 @@

+Mon Feb 23 00:43:44 CET 2004 (tk)

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

+  * libclamav: cl_rndnum: do not use buffered fread() (thanks to Nigel)

+

 Sun Feb 22 22:59:39 GMT 2004 (njh)

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

   * clamav-milter: Change the log level TCPwrapper denying

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.22 2004/02/21 15:08:38 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.23 2004/02/22 23:46:02 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.22 2004/02/21 15:08:38 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.23 2004/02/22 23:46:02 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -9573,9 +9573,11 @@ else

   cat >conftest.$ac_ext <<_ACEOF

 #line $LINENO "configure"

 #include "confdefs.h"

-#include <netinet/in.h>

+

 #include <sys/types.h>

+#include <netinet/in.h>

 int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }

+

 _ACEOF

 rm -f conftest$ac_exeext

 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

@@ -238,10 +238,11 @@ if test x"$tcpw" != xno; then

 fi

 # check for in_port_t definition

-AC_TRY_RUN([#include <netinet/in.h>

+AC_TRY_RUN([

 #include <sys/types.h>

-int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }],

-AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined))

+#include <netinet/in.h>

+int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }

+], AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined))

 dnl CLAMSCAN_LIBS=""

 dnl FRESHCLAM_LIBS=""

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 1999-2002 Tomasz Kojm <zolw@konarski.edu.pl>

+ *  Copyright (C) 1999 - 2004 Tomasz Kojm <tk@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -263,13 +263,13 @@ unsigned int cl_rndnum(unsigned int max)

 unsigned int cl_rndnum(unsigned int max)

 {

-	FILE *fd;

+	int fd;

 	unsigned int generated;

 	char *byte;

 	int size;

-    if((fd = fopen("/dev/urandom", "rb")) == NULL) {

+    if((fd = open("/dev/urandom", O_RDONLY)) < 0) {

 	cli_errmsg("!Can't open /dev/urandom.\n");

 	return -1;

     }

@@ -278,12 +278,12 @@ unsigned int cl_rndnum(unsigned int max)

     size = sizeof(generated);

     do {

 	int bread;

-	bread = fread(byte, 1, size, fd);

+	bread = read(fd, byte, 1);

 	size -= bread;

 	byte += bread;

     } while(size > 0);

-    fclose(fd);

+    close(fd);

     return generated % max;

 }

 #endif