git-svn: trunk@1620
Tomasz Kojm authored on 2005/06/19 07:37:54... | ... |
@@ -151,6 +151,8 @@ void clamd(struct optstruct *opt) |
151 | 151 |
logg("!setuid(%d) failed.\n", (int) user->pw_uid); |
152 | 152 |
exit(1); |
153 | 153 |
} |
154 |
+ |
|
155 |
+ logg("Running as user %s (UID %d, GID %d)\n", user->pw_name, user->pw_uid, user->pw_gid); |
|
154 | 156 |
} |
155 | 157 |
#endif |
156 | 158 |
|
... | ... |
@@ -256,7 +258,6 @@ void clamd(struct optstruct *opt) |
256 | 256 |
} |
257 | 257 |
|
258 | 258 |
|
259 |
- logg("Running as user %s (UID %d, GID %d)\n", cpt->strarg, user->pw_uid, user->pw_gid); |
|
260 | 259 |
/* fork into background */ |
261 | 260 |
if(!cfgopt(copt, "Foreground")->enabled) |
262 | 261 |
daemonize(); |
... | ... |
@@ -11188,9 +11188,11 @@ _ACEOF |
11188 | 11188 |
|
11189 | 11189 |
|
11190 | 11190 |
sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'` |
11191 |
- sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'` |
|
11192 |
- sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'` |
|
11193 |
- sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'` |
|
11191 |
+ |
|
11192 |
+ if test -n "$sendmailver"; then |
|
11193 |
+ sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'` |
|
11194 |
+ sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'` |
|
11195 |
+ sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'` |
|
11194 | 11196 |
|
11195 | 11197 |
|
11196 | 11198 |
cat >>confdefs.h <<_ACEOF |
... | ... |
@@ -11207,7 +11209,7 @@ cat >>confdefs.h <<_ACEOF |
11207 | 11207 |
#define SENDMAIL_VERSION_C $sendmailver_c |
11208 | 11208 |
_ACEOF |
11209 | 11209 |
|
11210 |
- |
|
11210 |
+ fi |
|
11211 | 11211 |
fi |
11212 | 11212 |
|
11213 | 11213 |
# Check whether --enable-dsig or --disable-dsig was given. |
... | ... |
@@ -172,14 +172,16 @@ if test "$have_milter" = "yes"; then |
172 | 172 |
AC_DEFINE_UNQUOTED(SENDMAIL_BIN, "$sendmailprog", [location of Sendmail binary]) |
173 | 173 |
|
174 | 174 |
sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'` |
175 |
- sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'` |
|
176 |
- sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'` |
|
177 |
- sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'` |
|
178 | 175 |
|
179 |
- AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail]) |
|
180 |
- AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail]) |
|
181 |
- AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail]) |
|
176 |
+ if test -n "$sendmailver"; then |
|
177 |
+ sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'` |
|
178 |
+ sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'` |
|
179 |
+ sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'` |
|
182 | 180 |
|
181 |
+ AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail]) |
|
182 |
+ AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail]) |
|
183 |
+ AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail]) |
|
184 |
+ fi |
|
183 | 185 |
fi |
184 | 186 |
|
185 | 187 |
AC_ARG_ENABLE(dsig, |