@@ -72,7 +72,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -7791,4 +7791,5 @@ m4_include([m4/acinclude.m4])

 m4_include([m4/fdpassing.m4])

 m4_include([m4/lib-link.m4])

 m4_include([m4/lib-prefix.m4])

+m4_include([m4/mmap_private.m4])

 m4_include([m4/resolv.m4])

@@ -39,9 +39,6 @@

 /* os is bsd flavor */

 #undef C_BSD

-/* os is cygwin */

-#undef C_CYGWIN

-

 /* os is darwin */

 #undef C_DARWIN

@@ -141,9 +138,6 @@

 /* gethostbyname_r takes 6 arguments */

 #undef HAVE_GETHOSTBYNAME_R_6

-/* Define to 1 if you have the `getpagesize' function. */

-#undef HAVE_GETPAGESIZE

-

 /* Define to 1 if you have the <grp.h> header file. */

 #undef HAVE_GRP_H

@@ -192,7 +186,8 @@

 /* Define to 1 if you have the `mkstemp' function. */

 #undef HAVE_MKSTEMP

-/* Define to 1 if you have a working `mmap' system call. */

+/* Define to 1 if you have a working `mmap' system call that supports

+   MAP_PRIVATE. */

 #undef HAVE_MMAP

 /* Define to 1 if you have the <ndir.h> header file. */

@@ -58,7 +58,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in INSTALL

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -6069,7 +6069,7 @@ verifyIncomingSocketName(const char *sockName)

 		return -1;

 	}

-	ptr = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);

+	ptr = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);

 	if(ptr == MAP_FAILED) {

 		perror("mmap");

 		close(fd);

@@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -58,7 +58,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -12513,159 +12513,14 @@ fi

 done

-

-for ac_header in stdlib.h unistd.h

-do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

-  { echo "$as_me:$LINENO: checking for $ac_header" >&5

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

-fi

-ac_res=`eval echo '${'$as_ac_Header'}'`

-	       { echo "$as_me:$LINENO: result: $ac_res" >&5

-echo "${ECHO_T}$ac_res" >&6; }

-else

-  # Is the header compilable?

-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-$ac_includes_default

-#include <$ac_header>

-_ACEOF

-rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"

-case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_compile") 2>conftest.er1

-  ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {

-	 test -z "$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       } && test -s conftest.$ac_objext; then

-  ac_header_compiler=yes

-else

-  echo "$as_me: failed program was:" >&5

-sed 's/^/| /' conftest.$ac_ext >&5

-

-	ac_header_compiler=no

-fi

-

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

-echo "${ECHO_T}$ac_header_compiler" >&6; }

-

-# Is the header present?

-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-#include <$ac_header>

-_ACEOF

-if { (ac_try="$ac_cpp conftest.$ac_ext"

-case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

-  ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } >/dev/null && {

-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       }; then

-  ac_header_preproc=yes

-else

-  echo "$as_me: failed program was:" >&5

-sed 's/^/| /' conftest.$ac_ext >&5

-

-  ac_header_preproc=no

-fi

-

-rm -f conftest.err conftest.$ac_ext

-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

-echo "${ECHO_T}$ac_header_preproc" >&6; }

-

-# So?  What about this header?

-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

-  yes:no: )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

-    ac_header_preproc=yes

-    ;;

-  no:yes:* )

-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5

-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5

-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

-    ( cat <<\_ASBOX

-## -------------------------------------- ##

-## Report this to http://bugs.clamav.net/ ##

-## -------------------------------------- ##

-_ASBOX

-     ) | sed "s/^/$as_me: WARNING:     /" >&2

-    ;;

-esac

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

+	{ echo "$as_me:$LINENO: checking for working mmap" >&5

+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }

+if test "${ac_cv_c_mmap_private+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6

 else

-  eval "$as_ac_Header=\$ac_header_preproc"

-fi

-ac_res=`eval echo '${'$as_ac_Header'}'`

-	       { echo "$as_me:$LINENO: result: $ac_res" >&5

-echo "${ECHO_T}$ac_res" >&6; }

-

-fi

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

-  cat >>confdefs.h <<_ACEOF

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

-_ACEOF

-

-fi

-done

-

-

-for ac_func in getpagesize

-do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

+		if test "$cross_compiling" = yes; then

+  ac_cv_c_mmap_private=no

 else

   cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

@@ -12673,224 +12528,64 @@ _ACEOF

 cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */

-#define $ac_func innocuous_$ac_func

-

-/* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.

-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

-    <limits.h> exists even on freestanding compilers.  */

-

-#ifdef __STDC__

-# include <limits.h>

-#else

-# include <assert.h>

-#endif

-#undef $ac_func

-

-/* Override any GCC internal prototype to avoid an error.

-   Use char because int might match the return type of a GCC

-   builtin and then its argument prototype would still apply.  */

-#ifdef __cplusplus

-extern "C"

+#include <unistd.h>

+#include <stdlib.h>

+#include <sys/mman.h>

+#ifdef HAVE_SYS_TYPES_H

+#include <sys/types.h>

 #endif

-char $ac_func ();

-/* The GNU C library defines this for functions which it implements

-    to always fail with ENOSYS.  Some functions are actually named

-    something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func

-choke me

+#ifdef HAVE_SYS_STAT_H

+#include <sys/stat.h>

 #endif

-

-int

-main ()

-{

-return $ac_func ();

-  ;

-  return 0;

-}

-_ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"

-case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_link") 2>conftest.er1

-  ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {

-	 test -z "$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       } && test -s conftest$ac_exeext &&

-       $as_test_x conftest$ac_exeext; then

-  eval "$as_ac_var=yes"

-else

-  echo "$as_me: failed program was:" >&5

-sed 's/^/| /' conftest.$ac_ext >&5

-

-	eval "$as_ac_var=no"

-fi

-

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

-      conftest$ac_exeext conftest.$ac_ext

-fi

-ac_res=`eval echo '${'$as_ac_var'}'`

-	       { echo "$as_me:$LINENO: result: $ac_res" >&5

-echo "${ECHO_T}$ac_res" >&6; }

-if test `eval echo '${'$as_ac_var'}'` = yes; then

-  cat >>confdefs.h <<_ACEOF

-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

-_ACEOF

-

-fi

-done

-

-{ echo "$as_me:$LINENO: checking for working mmap" >&5

-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }

-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

-else

-  if test "$cross_compiling" = yes; then

-  ac_cv_func_mmap_fixed_mapped=no

-else

-  cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-$ac_includes_default

-/* malloc might have been renamed as rpl_malloc. */

-#undef malloc

-

-/* Thanks to Mike Haertel and Jim Avera for this test.

-   Here is a matrix of mmap possibilities:

-	mmap private not fixed

-	mmap private fixed at somewhere currently unmapped

-	mmap private fixed at somewhere already mapped

-	mmap shared not fixed

-	mmap shared fixed at somewhere currently unmapped

-	mmap shared fixed at somewhere already mapped

-   For private mappings, we should verify that changes cannot be read()

-   back from the file, nor mmap's back from the file at a different

-   address.  (There have been systems where private was not correctly

-   implemented like the infamous i386 svr4.0, and systems where the

-   VM page cache was not coherent with the file system buffer cache

-   like early versions of FreeBSD and possibly contemporary NetBSD.)

-   For shared mappings, we should conversely verify that changes get

-   propagated back to all the places they're supposed to be.

-

-   Grep wants private fixed already mapped.

-   The main things grep needs to know about mmap are:

-   * does it exist and is it safe to write into the mmap'd area

-   * how to use it (BSD variants)  */

-

 #include <fcntl.h>

-#include <sys/mman.h>

-

-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H

-char *malloc ();

-#endif

-

-/* This mess was copied from the GNU getpagesize.h.  */

-#ifndef HAVE_GETPAGESIZE

-/* Assume that all systems that can run configure have sys/param.h.  */

-# ifndef HAVE_SYS_PARAM_H

-#  define HAVE_SYS_PARAM_H 1

-# endif

-

-# ifdef _SC_PAGESIZE

-#  define getpagesize() sysconf(_SC_PAGESIZE)

-# else /* no _SC_PAGESIZE */

-#  ifdef HAVE_SYS_PARAM_H

-#   include <sys/param.h>

-#   ifdef EXEC_PAGESIZE

-#    define getpagesize() EXEC_PAGESIZE

-#   else /* no EXEC_PAGESIZE */

-#    ifdef NBPG

-#     define getpagesize() NBPG * CLSIZE

-#     ifndef CLSIZE

-#      define CLSIZE 1

-#     endif /* no CLSIZE */

-#    else /* no NBPG */

-#     ifdef NBPC

-#      define getpagesize() NBPC

-#     else /* no NBPC */

-#      ifdef PAGESIZE

-#       define getpagesize() PAGESIZE

-#      endif /* PAGESIZE */

-#     endif /* no NBPC */

-#    endif /* no NBPG */

-#   endif /* no EXEC_PAGESIZE */

-#  else /* no HAVE_SYS_PARAM_H */

-#   define getpagesize() 8192	/* punt totally */

-#  endif /* no HAVE_SYS_PARAM_H */

-# endif /* no _SC_PAGESIZE */

-

-#endif /* no HAVE_GETPAGESIZE */

-

-int

-main ()

+int main(void)

 {

-  char *data, *data2, *data3;

-  int i, pagesize;

-  int fd;

-

-  pagesize = getpagesize ();

-

-  /* First, make a file with some known garbage in it. */

-  data = (char *) malloc (pagesize);

-  if (!data)

-    return 1;

-  for (i = 0; i < pagesize; ++i)

-    *(data + i) = rand ();

-  umask (0);

-  fd = creat ("conftest.mmap", 0600);

-  if (fd < 0)

-    return 1;

-  if (write (fd, data, pagesize) != pagesize)

-    return 1;

-  close (fd);

-

-  /* Next, try to mmap the file at a fixed address which already has

-     something else allocated at it.  If we can, also make sure that

-     we see the same garbage.  */

-  fd = open ("conftest.mmap", O_RDWR);

-  if (fd < 0)

-    return 1;

-  data2 = (char *) malloc (2 * pagesize);

-  if (!data2)

-    return 1;

-  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);

-  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,

-		     MAP_PRIVATE | MAP_FIXED, fd, 0L))

-    return 1;

-  for (i = 0; i < pagesize; ++i)

-    if (*(data + i) != *(data2 + i))

-      return 1;

-

-  /* Finally, make sure that changes to the mapped area do not

-     percolate back to the file as seen by read().  (This is a bug on

-     some variants of i386 svr4.0.)  */

-  for (i = 0; i < pagesize; ++i)

-    *(data2 + i) = *(data2 + i) + 1;

-  data3 = (char *) malloc (pagesize);

-  if (!data3)

-    return 1;

-  if (read (fd, data3, pagesize) != pagesize)

-    return 1;

-  for (i = 0; i < pagesize; ++i)

-    if (*(data + i) != *(data3 + i))

-      return 1;

-  close (fd);

-  return 0;

+	char *data, *data2, *data3;

+	unsigned i, datasize = 1024;

+	int fd;

+

+  	/* First, make a file with some known garbage in it. */

+	data = (char*) malloc(datasize);

+	if(!data)

+		return 1;

+	for(i=0;i<datasize;i++)

+		*(data + i) = rand();

+	umask(0);

+	fd = creat("conftest.mmap", 0600);

+	if(fd < 0)

+		return 1;

+	if(write (fd, data, datasize) != datasize)

+		return 1;

+	close(fd);

+	fd = open("conftest.mmap", O_RDWR);

+	if (fd < 0)

+		return 1;

+	/* Next, try to mmap the file at a fixed address which already has

+	   something else allocated at it.  If we can, also make sure that

+	   we see the same garbage.  */

+	data2 = mmap(NULL, sizeof(data), PROT_READ | PROT_WRITE,

+		MAP_PRIVATE, fd, 0L);

+	if(data2 == MAP_FAILED)

+		return 2;

+	for(i=0;i<sizeof(data);i++)

+		if(*(data + i) != *(data2+ i))

+			return 3;

+	  /* Finally, make sure that changes to the mapped area do not

+     	     percolate back to the file as seen by read().  (This is a bug on

+             some variants of i386 svr4.0.)  */

+	  for (i = 0; i < datasize; ++i)

+	    *(data2 + i) = *(data2 + i) + 1;

+	data3 = (char*) malloc(datasize);

+	if(!data3)

+		return 1;

+	if(read (fd, data3, datasize) != datasize)

+		return 1;

+	for(i=0;i<sizeof(data);i++)

+		if(*(data + i) != *(data3 + i))

+			return 3;

+	close(fd);

+	return 0;

 }

 _ACEOF

 rm -f conftest$ac_exeext

@@ -12913,23 +12608,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   ac_status=$?

   echo "$as_me:$LINENO: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then

-  ac_cv_func_mmap_fixed_mapped=yes

+  ac_cv_c_mmap_private=yes

 else

   echo "$as_me: program exited with status $ac_status" >&5

 echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5

 ( exit $ac_status )

-ac_cv_func_mmap_fixed_mapped=no

+ac_cv_c_mmap_private=no

 fi

 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi

 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5

-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }

-if test $ac_cv_func_mmap_fixed_mapped = yes; then

+{ echo "$as_me:$LINENO: result: $ac_cv_c_mmap_private" >&5

+echo "${ECHO_T}$ac_cv_c_mmap_private" >&6; }

+if test $ac_cv_c_mmap_private = yes; then

 cat >>confdefs.h <<\_ACEOF

 #define HAVE_MMAP 1

@@ -13914,7 +13609,8 @@ echo "$as_me: WARNING: ****** stability problems to the ClamAV developers!" >&2;

     if test "$ZLIB_HOME" != "/usr"; then

 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"

 	save_LDFLAGS="$LDFLAGS"

-	LDFLAGS="$LIBS -L$ZLIB_HOME/lib"

+	save_LIBS="$LIBS"

+	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"

 	{ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5

 echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6; }

 if test "${ac_cv_lib_z_inflateEnd+set}" = set; then

@@ -14064,6 +13760,7 @@ echo "$as_me: error: Your zlib is missing gzopen()" >&2;}

 fi

 	LDFLAGS="$save_LDFLAGS"

+	LIBS="$save_LIBS"

     else

 	{ echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5

 echo $ECHO_N "checking for inflateEnd in -lz... $ECHO_C" >&6; }

@@ -18956,7 +18653,8 @@ _ACEOF

 cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

-int main(int argc, char **argv) {

+

+			    int main(int argc, char **argv) {

 #pragma pack(1)			/* has to be in column 1 ! */

 			struct { char c; long l; } s;

 			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; }

@@ -314,7 +314,7 @@ AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAM

 AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])

 AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp])

-AC_FUNC_MMAP

+AC_C_FUNC_MMAP_PRIVATE

 AC_FUNC_FSEEKO

 enable_check_ut=auto

@@ -437,10 +437,12 @@ else

     if test "$ZLIB_HOME" != "/usr"; then

 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"

 	save_LDFLAGS="$LDFLAGS"

-	LDFLAGS="$LIBS -L$ZLIB_HOME/lib"

+	save_LIBS="$LIBS"

+	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"

 	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

 	AC_CHECK_LIB([z], [gzopen], [], AC_MSG_ERROR([Your zlib is missing gzopen()]))

 	LDFLAGS="$save_LDFLAGS"

+	LIBS="$save_LIBS"

     else

 	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))

 	AC_CHECK_LIB([z], [gzopen],[], AC_MSG_ERROR([Your zlib is missing gzopen()]))

@@ -1352,7 +1354,8 @@ AC_MSG_RESULT([$have_attrib_packed])

 if test "$have_attrib_packed" = no; then

 	AC_MSG_CHECKING([for structure packing via pragma])

 	AC_CACHE_VAL([have_pragma_pack],[

-		AC_TRY_RUN([int main(int argc, char **argv) {

+		AC_TRY_RUN([

+			    int main(int argc, char **argv) {

 #pragma pack(1)			/* has to be in column 1 ! */

 			struct { char c; long l; } s;

 			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],

@@ -56,7 +56,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -55,7 +55,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -55,7 +55,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -58,7 +58,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -59,7 +59,8 @@ DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -43,7 +43,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -43,7 +43,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -57,7 +57,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -37,7 +37,8 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -43,7 +43,8 @@ DIST_COMMON = $(am__dist_bin_SCRIPTS_DIST) $(srcdir)/Makefile.am \

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-link.m4 \

-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/resolv.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 \

+	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)