@@ -151,6 +151,8 @@ void clamd(struct optstruct *opt)

 	    logg("!setuid(%d) failed.\n", (int) user->pw_uid);

 	    exit(1);

 	}

+

+	logg("Running as user %s (UID %d, GID %d)\n", user->pw_name, user->pw_uid, user->pw_gid);

     }

 #endif

@@ -256,7 +258,6 @@ void clamd(struct optstruct *opt)

     }

-    logg("Running as user %s (UID %d, GID %d)\n", cpt->strarg, user->pw_uid, user->pw_gid);

     /* fork into background */

     if(!cfgopt(copt, "Foreground")->enabled)

 	daemonize();

@@ -11188,9 +11188,11 @@ _ACEOF

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

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

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

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

+

+  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

@@ -11207,7 +11209,7 @@ cat >>confdefs.h <<_ACEOF

 #define SENDMAIL_VERSION_C $sendmailver_c

 _ACEOF

-

+  fi

 fi

 # Check whether --enable-dsig or --disable-dsig was given.

@@ -172,14 +172,16 @@ if test "$have_milter" = "yes"; then

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

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

-  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])

+  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

 fi

 AC_ARG_ENABLE(dsig,