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

+Wed Aug 30 23:20:42 CEST 2006 (tk)

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

+  * configure: check for socklen_t and define it if needed

+

 Sun Aug 27 19:48:17 CEST 2006 (tk)

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

   * freshclam: apply timeout patch from Everton da Silva Marques

@@ -362,3 +362,6 @@

 /* Define to `long int' if <sys/types.h> does not define. */

 #undef off_t

+

+/* Define to "int" if <sys/socket.h> does not define. */

+#undef socklen_t

@@ -15434,6 +15434,173 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 echo "${ECHO_T}yes, and it takes $ac_cv_ctime_args arguments" >&6; }

 fi

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

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

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

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

+else

+

+    ac_cv_socklen_t=no

+    cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+	#include <sys/types.h>

+        #include <sys/socket.h>

+

+int

+main ()

+{

+

+	socklen_t len;

+        getpeername(0,0,&len);

+

+  ;

+  return 0;

+}

+_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); } &&

+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

+  { (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_try") 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; } &&

+	 { ac_try='test -s conftest.$ac_objext'

+  { (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_try") 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; }; then

+

+	ac_cv_socklen_t=yes

+

+else

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

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

+

+

+fi

+

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

+

+fi

+

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

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

+    if test $ac_cv_socklen_t = no; then

+    { echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5

+echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6; }

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

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

+else

+

+	ac_cv_socklen_t_equiv=int

+        for t in int size_t unsigned long "unsigned long"; do

+	    cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+		#include <sys/types.h>

+		#include <sys/socket.h>

+

+int

+main ()

+{

+

+		$t len;

+		getpeername(0,0,&len);

+

+  ;

+  return 0;

+}

+_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); } &&

+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

+  { (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_try") 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; } &&

+	 { ac_try='test -s conftest.$ac_objext'

+  { (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_try") 2>&5

+  ac_status=$?

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

+  (exit $ac_status); }; }; then

+

+		ac_cv_socklen_t_equiv="$t"

+		break

+

+else

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

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

+

+

+fi

+

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

+	done

+

+fi

+

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

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

+

+cat >>confdefs.h <<_ACEOF

+#define socklen_t $ac_cv_socklen_t_equiv

+_ACEOF

+

+fi

+

 if test "$test_clamav" = "yes"

 then

         if test "$use_id" = "no"

@@ -1,6 +1,7 @@

 dnl

 dnl   Copyright (C) 2002 - 2006 Tomasz Kojm <tkojm@clamav.net>

 dnl   gethostbyname_r and readdir_r checks (c) COPYRIGHT MIT 1995

+dnl   socklen_t check (c) Alexander V. Lukyanov <lav@yars.free.net>

 dnl

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

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

@@ -867,6 +868,48 @@ if test "$ac_cv_func_ctime_r" = "yes"; then

     AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments])

 fi

+dnl Determine socklen_t type. Code from lftp.

+AC_MSG_CHECKING(for socklen_t)

+AC_CACHE_VAL(ac_cv_socklen_t,

+[

+    ac_cv_socklen_t=no

+    AC_TRY_COMPILE([

+	#include <sys/types.h>

+        #include <sys/socket.h>

+    ],

+    [

+	socklen_t len;

+        getpeername(0,0,&len);

+    ],

+    [

+	ac_cv_socklen_t=yes

+    ])

+])

+AC_MSG_RESULT($ac_cv_socklen_t)

+    if test $ac_cv_socklen_t = no; then

+    AC_MSG_CHECKING(for socklen_t equivalent)

+    AC_CACHE_VAL(ac_cv_socklen_t_equiv,

+    [

+	ac_cv_socklen_t_equiv=int

+        for t in int size_t unsigned long "unsigned long"; do

+	    AC_TRY_COMPILE([

+		#include <sys/types.h>

+		#include <sys/socket.h>

+	    ],

+            [

+		$t len;

+		getpeername(0,0,&len);

+            ],

+            [

+		ac_cv_socklen_t_equiv="$t"

+		break

+            ])

+	done

+    ])

+    AC_MSG_RESULT($ac_cv_socklen_t_equiv)

+    AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t_equiv, [Define to "int" if <sys/socket.h> does not define.])

+fi

+

 dnl Check for clamav in /etc/passwd

 if test "$test_clamav" = "yes"

 then