diff options
| author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-05-19 11:37:45 +0000 |
|---|---|---|
| committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-05-19 11:37:45 +0000 |
| commit | 65424ed6191c108c9522ceb76fb060bf2a3dccc1 (patch) | |
| tree | 7cca89d018a8d5e4c13b56b49efb8df70e416eb6 /usr.sbin/smtpd/smtpd.c | |
| parent | 6605dde7b156889e10a66d8abc8d4a5e55e400db (diff) | |
Do not ever run /usr/sbin/sendmail, it could link to sendmail
interface for a different MTA. Use the binary in /usr/libexec
directly instead.
Based on remark claudio@ made in passing.
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.c')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index a65a3b7eeca..94922222018 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.59 2009/05/19 11:24:24 jacekm Exp $ */ +/* $OpenBSD: smtpd.c,v 1.60 2009/05/19 11:37:44 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -1385,7 +1385,7 @@ parent_enqueue_offline(struct smtpd *env, char *runner_path) _exit(1); p[len - 1] = '\0'; - addargs(&args, "%s", _PATH_SENDMAIL); + addargs(&args, "%s", "sendmail"); while ((tmp = strsep(&p, "|")) != NULL) addargs(&args, "%s", tmp); @@ -1397,7 +1397,7 @@ parent_enqueue_offline(struct smtpd *env, char *runner_path) envp[1] = (char *)NULL; environ = envp; - execvp(args.list[0], args.list); + execvp(PATH_SMTPCTL, args.list); _exit(1); } |