@@ -28,6 +28,6 @@ pkgconfig_DATA = libclamav.pc

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

-DISTCHECK_CONFIGURE_FLAGS=--enable-milter CFLAGS="-Wno-pointer-sign -Wno-error=attributes -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wpadded -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-error=unused-parameter -Wpacked -Wno-error=packed -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=padded"

+DISTCHECK_CONFIGURE_FLAGS=--enable-milter CFLAGS="-Wno-pointer-sign -Wno-error=attributes -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wpadded -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wpacked -Wno-error=packed -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=padded"

 lcov:

 	($(MAKE); cd unit_tests; $(MAKE) lcov)

@@ -263,7 +263,7 @@ pkgconfig_DATA = libclamav.pc

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

-DISTCHECK_CONFIGURE_FLAGS = --enable-milter CFLAGS="-Wno-pointer-sign -Wno-error=attributes -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wpadded -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-error=unused-parameter -Wpacked -Wno-error=packed -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=padded"

+DISTCHECK_CONFIGURE_FLAGS = --enable-milter CFLAGS="-Wno-pointer-sign -Wno-error=attributes -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wpadded -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wpacked -Wno-error=packed -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=padded"

 all: clamav-config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -174,6 +174,7 @@ typedef	unsigned int	in_addr_t;

 #define	VERSION_LENGTH	128

 #define	DEFAULT_TIMEOUT	120

+

 #define	NTRIES	5	/* How many times we try to connect to a clamd */

 /*#define	SESSION*/

@@ -233,10 +234,10 @@ static struct cidr_net {	/* don't make this const because of -I flag */

 	uint32_t	base;

 	uint32_t	mask;

 } localNets[] = {

-	/*{ PACKADDR(127,   0,   0,   0), MAKEMASK(8) },	/*   127.0.0.0/8 */

+	/*{ PACKADDR(127,   0,   0,   0), MAKEMASK(8) },	*   127.0.0.0/8 */

 	{ PACKADDR(192, 168,   0,   0), MAKEMASK(16) },	/* 192.168.0.0/16 - RFC3330 */

-	/*{ PACKADDR(192, 18,   0,   0), MAKEMASK(15) },	/* 192.18.0.0/15 - RFC2544 */

-	/*{ PACKADDR(192, 0,   2,   0), MAKEMASK(24) },	/* 192.0.2.0/24 - RFC3330 */

+	/*{ PACKADDR(192, 18,   0,   0), MAKEMASK(15) },	* 192.18.0.0/15 - RFC2544 */

+	/*{ PACKADDR(192, 0,   2,   0), MAKEMASK(24) },	* 192.0.2.0/24 - RFC3330 */

 	{ PACKADDR( 10,   0,   0,   0), MAKEMASK(8) },	/*    10.0.0.0/8 */

 	{ PACKADDR(172,  16,   0,   0), MAKEMASK(12) },	/*  172.16.0.0/12 */

 	{ PACKADDR(169, 254,   0,   0), MAKEMASK(16) },	/* 169.254.0.0/16 */

@@ -325,7 +326,11 @@ static	sfsistat	clamfi_abort(SMFICTX *ctx);

 static	sfsistat	clamfi_close(SMFICTX *ctx);

 static	void		clamfi_cleanup(SMFICTX *ctx);

 static	void		clamfi_free(struct privdata *privdata, int keep);

+#ifdef __GNUC__

+static	int		clamfi_send(struct privdata *privdata, size_t len, const char *format, ...) __attribute__((format(printf, 3,4)));

+#else

 static	int		clamfi_send(struct privdata *privdata, size_t len, const char *format, ...);

+#endif

 static	long		clamd_recv(int sock, char *buf, size_t len);

 static	off_t		updateSigFile(void);

 static	header_list_t	header_list_new(void);

@@ -447,7 +452,7 @@ static	long	streamMaxLength = -1;	/* StreamMaxLength from clamd.conf */

 static	int	logok = 0;	/*

 				 * Add clean items to the log file

 				 */

-static	char	*signature = N_("-- \nScanned by ClamAv - http://www.clamav.net\n");

+static	const char	*signature = N_("-- \nScanned by ClamAv - http://www.clamav.net\n");

 static	time_t	signatureStamp;

 static	char	*templateFile;	/* e-mail to be sent when virus detected */

 static	char	*templateHeaders;	/* headers to be added to the above */

@@ -598,7 +603,7 @@ res_state res_pool;

 uint8_t *res_pool_state;

 pthread_cond_t res_pool_cond = PTHREAD_COND_INITIALIZER;

-int safe_res_query(const char *d, int c, int t, u_char *a, int l) {

+static int safe_res_query(const char *d, int c, int t, u_char *a, int l) {

 	int i = -1, ret;

 	pthread_mutex_lock(&res_pool_mutex);

@@ -626,7 +631,7 @@ int safe_res_query(const char *d, int c, int t, u_char *a, int l) {

 #else /* !HAVE_LRESOLV_R - non thread safe resolver (old bsd's) */

-int safe_res_query(const char *d, int c, int t, u_char *a, int l) {

+static int safe_res_query(const char *d, int c, int t, u_char *a, int l) {

 	int ret;

 	pthread_mutex_lock(&res_pool_mutex);

 	ret = res_query(d, c, t, a, l);

@@ -695,10 +700,10 @@ help(void)

 	puts(_("For bug reports, please refer to http://www.clamav.net/bugs"));

 }

+extern char *optarg;

 int

 main(int argc, char **argv)

 {

-	extern char *optarg;

 	int i, Bflag = 0, server = 0;

 	char *cfgfile = NULL;

 	const char *wont_blacklist = NULL;

@@ -1919,8 +1924,7 @@ main(int argc, char **argv)

 #endif

 		}

-		close(2);

-		dup(1);

+		dup2(1, 2);

 #ifdef	CL_DEBUG

 		if(consolefd >= 0)

@@ -2070,13 +2074,22 @@ main(int argc, char **argv)

 		umask(old_umask);

 	} else if(tmpdir) {

 		if(rootdir == NULL)

-			chdir(tmpdir);	/* safety */

+			if(chdir(tmpdir) < 0) {	/* safety */

+				perror(tmpdir);

+				logg("!chdir %s failed\n", tmpdir);

+			}

 	} else

 		if(rootdir == NULL)

 #ifdef	P_tmpdir

-			chdir(P_tmpdir);

+			if(chdir(P_tmpdir) < 0) {

+				perror(P_tmpdir);

+				logg("!chdir %s failed\n", P_tmpdir);

+			}

 #else

-			chdir("/tmp");

+			if(chdir("/tmp") < 0) {

+				perror("/tmp");

+				logg("!chdir /tmp failed\n", P_tmpdir);

+			}

 #endif

 	if(cfgopt(copt, "FixStaleSocket")->enabled) {

@@ -2740,11 +2753,11 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 #ifdef HAVE_INET_NTOP

 		switch(hostaddr->sa_family) {

 			case AF_INET:

-				remoteIP = (char *)inet_ntop(AF_INET, &((struct sockaddr_in *)(hostaddr))->sin_addr, ip, sizeof(ip));

+				remoteIP = (const char *)inet_ntop(AF_INET, &((struct sockaddr_in *)(hostaddr))->sin_addr, ip, sizeof(ip));

 				break;

 #ifdef AF_INET6

 			case AF_INET6:

-				remoteIP = (char *)inet_ntop(AF_INET6, &((struct sockaddr_in6 *)(hostaddr))->sin6_addr, ip, sizeof(ip));

+				remoteIP = (const char *)inet_ntop(AF_INET6, &((struct sockaddr_in6 *)(hostaddr))->sin6_addr, ip, sizeof(ip));

 				break;

 #endif

 			default:

@@ -3333,7 +3346,7 @@ clamfi_body(SMFICTX *ctx, u_char *bodyp, size_t len)

 				nbytes += clamfi_send(privdata, 1, ptr++);

 				left--;

 			}

-			if(left < 6) {

+			if(left < 6 && left > 0) {

 				nbytes += clamfi_send(privdata, left, ptr);

 				break;

 			}

@@ -4030,7 +4043,7 @@ clamfi_eom(SMFICTX *ctx)

 		 * quarantine email

 		 */

 		snprintf(reject, sizeof(reject) - 1, _("virus %s detected by ClamAV - http://www.clamav.net"), virusname);

-		smfi_setreply(ctx, (char *)privdata->rejectCode, "5.7.1", reject);

+		smfi_setreply(ctx, (const char *)privdata->rejectCode, "5.7.1", reject);

 		broadcast(mess);

 		if(blacklist_time && privdata->ip[0]) {

@@ -4269,7 +4282,6 @@ clamfi_send(struct privdata *privdata, size_t len, const char *format, ...)

 	char output[BUFSIZ];

 	const char *ptr;

 	int ret = 0;

-

 	assert(format != NULL);

 	if(len > 0)

@@ -5823,7 +5835,6 @@ broadcast(const char *mess)

 static int

 loadDatabase(void)

 {

-	/*extern const char *cl_retdbdir(void);	/* FIXME: should be included */

 	int ret;

 	unsigned int signatures, dboptions;

 	char *daily;

@@ -5956,10 +5967,10 @@ sigsegv(int sig)

 	smfi_stop();

 }

+extern FILE *logg_fd;

 static void

 sighup(int sig)

 {

-	extern FILE *logg_fd;

 	signal(SIGHUP, sighup);

@@ -5969,8 +5980,7 @@ sighup(int sig)

 	logg("SIGHUP caught: re-opening log file\n");

 	logg_close();

 	logg("*Log file re-opened\n");

-	close(2);

-	dup(fileno(logg_fd));

+	dup2(fileno(logg_fd), 2);

 }

 static void

@@ -7003,6 +7013,5 @@ connect_error(int sock, const char *hostname)

 		return -1;

 	}

 #endif

-

 	return 0;

 }

@@ -884,7 +884,6 @@ MAINT

 LIBBZ2

 LTLIBBZ2

 LIBBZ2_PREFIX

-sendmailprog

 HAVE_LIBGMP

 LIBGMP

 LTLIBGMP

@@ -897,6 +896,7 @@ CLAMAV_MILTER_LIBS

 FRESHCLAM_LIBS

 TH_SAFE

 THREAD_LIBS

+sendmailprog

 BUILD_CLAMD_TRUE

 BUILD_CLAMD_FALSE

 HAVE_MILTER_TRUE

@@ -1550,14 +1550,14 @@ Optional Packages:

   --with-gnu-ld           assume the C compiler uses GNU ld default=no

   --with-libbz2-prefix[=DIR]  search for libbz2 in DIR/include and DIR/lib

   --without-libbz2-prefix     don't search for libbz2 in includedir and libdir

-  --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)

-  --with-sendmail-version=VERSION    specify version of Sendmail (default=auto find)

   --with-libgmp-prefix[=DIR]  search for libgmp in DIR/include and DIR/lib

   --without-libgmp-prefix     don't search for libgmp in includedir and libdir

   --with-iconv supports iconv() (default=auto)

   --with-user=uid	  name of the clamav user (default=clamav)

   --with-group=gid	  name of the clamav group (default=clamav)

   --with-dbdir=path	  path to virus database directory

+  --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)

+  --with-sendmail-version=VERSION    specify version of Sendmail (default=auto find)

   --with-tcpwrappers      support hosts.allow / hosts.deny (default=auto)

 Some influential environment variables:

@@ -15425,7 +15425,7 @@ else

 #include <netinet/in.h>

 #include <arpa/nameser.h>

 #include <resolv.h>

-int main() { return (int)dn_expand; }

+int main() { return (long)dn_expand; }

 _ACEOF

 rm -f conftest.$ac_objext conftest$ac_exeext

@@ -15479,7 +15479,7 @@ else

 #include <netinet/in.h>

 #include <arpa/nameser.h>

 #include <resolv.h>

-int main() { return (int)dn_expand; }

+int main() { return (long)dn_expand; }

 _ACEOF

 rm -f conftest.$ac_objext conftest$ac_exeext

@@ -15548,7 +15548,7 @@ else

 #include <netinet/in.h>

 #include <arpa/nameser.h>

 #include <resolv.h>

-int main() { return (int)res_nquery; }

+int main() { return (long)res_nquery; }

 _ACEOF

 rm -f conftest.$ac_objext conftest$ac_exeext

@@ -15755,108 +15755,6 @@ else

 fi

-if test "$have_milter" = "yes"; then

-  sendmailprog=no

-

-# Check whether --with-sendmail was given.

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

-  withval=$with_sendmail; sendmailprog=$with_sendmail

-else

-  sendmailprog=no

-fi

-

-

-  if test "$sendmailprog" = "no" ; then

-    # Extract the first word of "sendmail", so it can be a program name with args.

-set dummy sendmail; ac_word=$2

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

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

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

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

-else

-  case $sendmailprog in

-  [\\/]* | ?:[\\/]*)

-  ac_cv_path_sendmailprog="$sendmailprog" # Let the user override the test with a path.

-  ;;

-  *)

-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-as_dummy="$PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec"

-for as_dir in $as_dummy

-do

-  IFS=$as_save_IFS

-  test -z "$as_dir" && as_dir=.

-  for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

-    ac_cv_path_sendmailprog="$as_dir/$ac_word$ac_exec_ext"

-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

-    break 2

-  fi

-done

-done

-IFS=$as_save_IFS

-

-  test -z "$ac_cv_path_sendmailprog" && ac_cv_path_sendmailprog="no"

-  ;;

-esac

-fi

-sendmailprog=$ac_cv_path_sendmailprog

-if test -n "$sendmailprog"; then

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

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

-else

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

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

-fi

-

-

-  fi

-

-

-cat >>confdefs.h <<_ACEOF

-#define SENDMAIL_BIN "$sendmailprog"

-_ACEOF

-

-

-

-# Check whether --with-sendmail-version was given.

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

-  withval=$with_sendmail_version; sendmailvers=$with_sendmail_version

-else

-  sendmailvers=no

-fi

-

-

-  if test "$sendmailvers" = "no" ; then

-    sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

-  fi

-

-  if test -n "$sendmailver"; then

-    sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`

-    sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`

-    sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`

-

-

-cat >>confdefs.h <<_ACEOF

-#define SENDMAIL_VERSION_A $sendmailver_a

-_ACEOF

-

-

-cat >>confdefs.h <<_ACEOF

-#define SENDMAIL_VERSION_B $sendmailver_b

-_ACEOF

-

-

-cat >>confdefs.h <<_ACEOF

-#define SENDMAIL_VERSION_C $sendmailver_c

-_ACEOF

-

-  fi

-  if test "x$ac_cv_have_lresolv_r" != "xyes"; then

-    { echo "$as_me:$LINENO: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&5

-echo "$as_me: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&2;}

-  fi

-fi

-

 # Check whether --enable-dsig was given.

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

   enableval=$enable_dsig; want_dsig=$enableval

@@ -16523,7 +16421,7 @@ main ()

 {

 	char** xin,**xout;

-	unsigned il,ol;

+	unsigned long il,ol;

 	int rc;

 	iconv_t iconv_struct = iconv_open("UTF-16BE","UTF-8");

 	rc = iconv(iconv_struct,xin,&il,xout,&ol);

@@ -17746,6 +17644,181 @@ done

 fi

+if test "$have_milter" = "yes"; then

+  sendmailprog=no

+

+# Check whether --with-sendmail was given.

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

+  withval=$with_sendmail; sendmailprog=$with_sendmail

+else

+  sendmailprog=no

+fi

+

+

+  if test "$sendmailprog" = "no" ; then

+    # Extract the first word of "sendmail", so it can be a program name with args.

+set dummy sendmail; ac_word=$2

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

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

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

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

+else

+  case $sendmailprog in

+  [\\/]* | ?:[\\/]*)

+  ac_cv_path_sendmailprog="$sendmailprog" # Let the user override the test with a path.

+  ;;

+  *)

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+as_dummy="$PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec"

+for as_dir in $as_dummy

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+  for ac_exec_ext in '' $ac_executable_extensions; do

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+    ac_cv_path_sendmailprog="$as_dir/$ac_word$ac_exec_ext"

+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+done

+IFS=$as_save_IFS

+

+  test -z "$ac_cv_path_sendmailprog" && ac_cv_path_sendmailprog="no"

+  ;;

+esac

+fi

+sendmailprog=$ac_cv_path_sendmailprog

+if test -n "$sendmailprog"; then

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

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

+else

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

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

+fi

+

+

+  fi

+

+

+cat >>confdefs.h <<_ACEOF

+#define SENDMAIL_BIN "$sendmailprog"

+_ACEOF

+

+

+

+# Check whether --with-sendmail-version was given.

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

+  withval=$with_sendmail_version; sendmailvers=$with_sendmail_version

+else

+  sendmailvers=no

+fi

+

+

+  if test "$sendmailvers" = "no" ; then

+    sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

+  fi

+

+  if test -z "$sendmailver"; then

+	# example: postfix

+	LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"

+	{ echo "$as_me:$LINENO: checking for smfi_opensocket in -lmilter" >&5

+echo $ECHO_N "checking for smfi_opensocket in -lmilter... $ECHO_C" >&6; }

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

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

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lmilter  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+/* 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"

+#endif

+char smfi_opensocket ();

+int

+main ()

+{

+return smfi_opensocket ();

+  ;

+  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

+  ac_cv_lib_milter_smfi_opensocket=yes

+else

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

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

+

+	ac_cv_lib_milter_smfi_opensocket=no

+fi

+

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

+      conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

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

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

+if test $ac_cv_lib_milter_smfi_opensocket = yes; then

+  sendmailver="8.13.0"

+else

+  { echo "$as_me:$LINENO: WARNING: cannot determine sendmail version" >&5

+echo "$as_me: WARNING: cannot determine sendmail version" >&2;}

+fi

+

+	LDFLAGS="$save_LDFLAGS"

+  fi

+  if test -n "$sendmailver"; then

+    sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`

+    sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`

+    sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`

+

+

+cat >>confdefs.h <<_ACEOF

+#define SENDMAIL_VERSION_A $sendmailver_a

+_ACEOF

+

+

+cat >>confdefs.h <<_ACEOF

+#define SENDMAIL_VERSION_B $sendmailver_b

+_ACEOF

+

+

+cat >>confdefs.h <<_ACEOF

+#define SENDMAIL_VERSION_C $sendmailver_c

+_ACEOF

+

+  fi

+  if test "x$ac_cv_have_lresolv_r" != "xyes"; then

+    { echo "$as_me:$LINENO: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&5

+echo "$as_me: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&2;}

+  fi

+fi

+

  if test "$have_pthreads" = "yes"; then

   BUILD_CLAMD_TRUE=

   BUILD_CLAMD_FALSE='#'

@@ -19536,14 +19609,15 @@ cat >>conftest.$ac_ext <<_ACEOF

 #define TEST "test"

-int send_fd(int s, int fd)

+static int send_fd(int s, int fd)

 {

     struct msghdr msg;

     struct cmsghdr *cmsg;

     unsigned char fdbuf[CMSG_SPACE(sizeof(int))];

     struct iovec iov[1];

+    char dummy[] = "";

-    iov[0].iov_base = "";

+    iov[0].iov_base = dummy;

     iov[0].iov_len = 1;

     memset(&msg, 0, sizeof(msg));

@@ -19567,7 +19641,7 @@ int send_fd(int s, int fd)

     return 0;

 }

-int testfd(int desc)

+static int testfd(int desc)

 {

     char buf[256];

     if(read(desc, buf, sizeof(buf)) != sizeof(TEST)) {

@@ -19577,7 +19651,7 @@ int testfd(int desc)

     return memcmp(buf, TEST, sizeof(TEST));

 }

-int recv_fd(int desc)

+static int recv_fd(int desc)

 {

     unsigned char buf[CMSG_SPACE(sizeof(int))];

     struct msghdr msg;

@@ -19643,7 +19717,10 @@ int main(void)

             waitpid(pid, NULL, 0);

             return 2;

         }

-        write(pip[1], TEST, sizeof(TEST));

+        if(write(pip[1], TEST, sizeof(TEST)) != sizeof(TEST)) {

+		close(pip[1]);

+		return -1;

+	}

         close(pip[1]);

         waitpid(pid, &status, 0);

     }

@@ -19716,14 +19793,15 @@ cat >>conftest.$ac_ext <<_ACEOF

 #define TEST "test"

-int send_fd(int s, int fd)

+static int send_fd(int s, int fd)

 {

     struct msghdr msg;

     struct cmsghdr *cmsg;

     unsigned char fdbuf[CMSG_SPACE(sizeof(int))];

     struct iovec iov[1];

+    char dummy[] = "";

-    iov[0].iov_base = "";

+    iov[0].iov_base = dummy;

     iov[0].iov_len = 1;

     memset(&msg, 0, sizeof(msg));

@@ -19747,7 +19825,7 @@ int send_fd(int s, int fd)

     return 0;

 }

-int testfd(int desc)

+static int testfd(int desc)

 {

     char buf[256];

     if(read(desc, buf, sizeof(buf)) != sizeof(TEST)) {

@@ -19757,7 +19835,7 @@ int testfd(int desc)

     return memcmp(buf, TEST, sizeof(TEST));

 }

-int recv_fd(int desc)

+static int recv_fd(int desc)

 {

     unsigned char buf[CMSG_SPACE(sizeof(int))];

     struct msghdr msg;

@@ -19823,7 +19901,10 @@ int main(void)

             waitpid(pid, NULL, 0);

             return 2;

         }

-        write(pip[1], TEST, sizeof(TEST));

+        if(write(pip[1], TEST, sizeof(TEST)) != sizeof(TEST)) {

+		close(pip[1]);

+		return -1;

+	}

         close(pip[1]);

         waitpid(pid, &status, 0);

     }

@@ -20777,7 +20858,6 @@ MAINT!$MAINT$ac_delim

 LIBBZ2!$LIBBZ2$ac_delim

 LTLIBBZ2!$LTLIBBZ2$ac_delim

 LIBBZ2_PREFIX!$LIBBZ2_PREFIX$ac_delim

-sendmailprog!$sendmailprog$ac_delim

 HAVE_LIBGMP!$HAVE_LIBGMP$ac_delim

 LIBGMP!$LIBGMP$ac_delim

 LTLIBGMP!$LTLIBGMP$ac_delim

@@ -20790,6 +20870,7 @@ CLAMAV_MILTER_LIBS!$CLAMAV_MILTER_LIBS$ac_delim

 FRESHCLAM_LIBS!$FRESHCLAM_LIBS$ac_delim

 TH_SAFE!$TH_SAFE$ac_delim

 THREAD_LIBS!$THREAD_LIBS$ac_delim

+sendmailprog!$sendmailprog$ac_delim

 BUILD_CLAMD_TRUE!$BUILD_CLAMD_TRUE$ac_delim

 BUILD_CLAMD_FALSE!$BUILD_CLAMD_FALSE$ac_delim

 HAVE_MILTER_TRUE!$HAVE_MILTER_TRUE$ac_delim

@@ -550,40 +550,6 @@ AC_ARG_ENABLE([milter],

 [  --enable-milter	  build clamav-milter],

 have_milter=$enableval, have_milter="no")

-if test "$have_milter" = "yes"; then

-  sendmailprog=no

-  AC_ARG_WITH([sendmail],

-  [  --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)],

-  sendmailprog=$with_sendmail, sendmailprog=no)

-

-  if test "$sendmailprog" = "no" ; then

-    AC_PATH_PROG([sendmailprog], sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)

-  fi

-

-  AC_DEFINE_UNQUOTED([SENDMAIL_BIN], "$sendmailprog", [location of Sendmail binary])

-

-  AC_ARG_WITH(sendmail-version,

-  [  --with-sendmail-version=VERSION    specify version of Sendmail (default=auto find)],

-  sendmailvers=$with_sendmail_version, sendmailvers=no)

-

-  if test "$sendmailvers" = "no" ; then

-    sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

-  fi

-

-  if test -n "$sendmailver"; then

-    sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`

-    sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`

-    sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`

-

-    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_A], $sendmailver_a, [major version of Sendmail])

-    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_B], $sendmailver_b, [minor version of Sendmail])

-    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_C], $sendmailver_c, [subversion of Sendmail])

-  fi

-  if test "x$ac_cv_have_lresolv_r" != "xyes"; then

-    AC_MSG_WARN([****** Your libresolv is not thread safe, SPF queries in clamav-milter will block])

-  fi

-fi

-

 AC_ARG_ENABLE([dsig],

 [  --disable-dsig	  disable support for digital signatures],

 want_dsig=$enableval, want_dsig="yes")

@@ -625,7 +591,7 @@ if test "X$wiconv" != "Xno"; then

 		     #include <iconv.h>

 	],[

 	char** xin,**xout;

-	unsigned il,ol;

+	unsigned long il,ol;

 	int rc;

 	iconv_t iconv_struct = iconv_open("UTF-16BE","UTF-8");

 	rc = iconv(iconv_struct,xin,&il,xout,&ol);

@@ -1030,6 +996,47 @@ if test "$have_milter" = "yes"; then

     ])

 fi

+if test "$have_milter" = "yes"; then

+  sendmailprog=no

+  AC_ARG_WITH([sendmail],

+  [  --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)],

+  sendmailprog=$with_sendmail, sendmailprog=no)

+

+  if test "$sendmailprog" = "no" ; then

+    AC_PATH_PROG([sendmailprog], sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)

+  fi

+

+  AC_DEFINE_UNQUOTED([SENDMAIL_BIN], "$sendmailprog", [location of Sendmail binary])

+

+  AC_ARG_WITH(sendmail-version,

+  [  --with-sendmail-version=VERSION    specify version of Sendmail (default=auto find)],

+  sendmailvers=$with_sendmail_version, sendmailvers=no)

+

+  if test "$sendmailvers" = "no" ; then

+    sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`

+  fi

+

+  if test -z "$sendmailver"; then

+	# example: postfix

+	LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"

+	AC_CHECK_LIB([milter],[smfi_opensocket],[sendmailver="8.13.0"],

+		     [AC_MSG_WARN([cannot determine sendmail version])])

+	LDFLAGS="$save_LDFLAGS"

+  fi

+  if test -n "$sendmailver"; then

+    sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`

+    sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`

+    sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`

+

+    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_A], $sendmailver_a, [major version of Sendmail])

+    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_B], $sendmailver_b, [minor version of Sendmail])

+    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_C], $sendmailver_c, [subversion of Sendmail])

+  fi

+  if test "x$ac_cv_have_lresolv_r" != "xyes"; then

+    AC_MSG_WARN([****** Your libresolv is not thread safe, SPF queries in clamav-milter will block])

+  fi

+fi

+

 AM_CONDITIONAL([BUILD_CLAMD],[test "$have_pthreads" = "yes"])

 AM_CONDITIONAL([HAVE_MILTER],[test "$have_milter" = "yes"])

 AM_CONDITIONAL([ENABLE_UNRAR],[test "$want_unrar" = "yes"])

@@ -19,14 +19,15 @@ $1

 #define TEST "test"

-int send_fd(int s, int fd)

+static int send_fd(int s, int fd)

 {

     struct msghdr msg;

     struct cmsghdr *cmsg;

     unsigned char fdbuf[CMSG_SPACE(sizeof(int))];

     struct iovec iov[1];

+    char dummy[] = "";

-    iov[0].iov_base = "";

+    iov[0].iov_base = dummy;

     iov[0].iov_len = 1;

     memset(&msg, 0, sizeof(msg));

@@ -50,7 +51,7 @@ int send_fd(int s, int fd)

     return 0;

 }

-int testfd(int desc)

+static int testfd(int desc)

 {

     char buf[256];

     if(read(desc, buf, sizeof(buf)) != sizeof(TEST)) {

@@ -60,7 +61,7 @@ int testfd(int desc)

     return memcmp(buf, TEST, sizeof(TEST));

 }

-int recv_fd(int desc)

+static int recv_fd(int desc)

 {

     unsigned char buf[CMSG_SPACE(sizeof(int))];

     struct msghdr msg;

@@ -126,7 +127,10 @@ int main(void)

             waitpid(pid, NULL, 0);

             return 2;

         }

-        write(pip[1], TEST, sizeof(TEST));

+        if(write(pip[1], TEST, sizeof(TEST)) != sizeof(TEST)) {

+		close(pip[1]);

+		return -1;

+	}

         close(pip[1]);

         waitpid(pid, &status, 0);

     }

@@ -23,7 +23,7 @@ if test $want_dns = yes; then

 #include <netinet/in.h>

 #include <arpa/nameser.h>

 #include <resolv.h>

-int main() { return (int)dn_expand; }

+int main() { return (long)dn_expand; }

 		],

 		[

 		    ac_cv_have_lresolv_std='yes'

@@ -40,7 +40,7 @@ int main() { return (int)dn_expand; }

 #include <netinet/in.h>

 #include <arpa/nameser.h>

 #include <resolv.h>

-int main() { return (int)dn_expand; }

+int main() { return (long)dn_expand; }

     	     	],

 		[

 		    ac_cv_have_lresolv_lresolv='yes'

@@ -69,7 +69,7 @@ int main() { return (int)dn_expand; }

 #include <netinet/in.h>

 #include <arpa/nameser.h>

 #include <resolv.h>

-int main() { return (int)res_nquery; }

+int main() { return (long)res_nquery; }

     	    ],

 	    [

 	        ac_cv_have_lresolv_r='yes'