diff options
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 6 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 3 |
2 files changed, 5 insertions, 4 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); } diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 34fb604ea73..6d5d7540009 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.109 2009/05/19 11:24:24 jacekm Exp $ */ +/* $OpenBSD: smtpd.h,v 1.110 2009/05/19 11:37:44 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -46,6 +46,7 @@ #define SMTPD_BACKLOG 5 #define PATH_MAILLOCAL "/usr/libexec/mail.local" +#define PATH_SMTPCTL "/usr/sbin/smtpctl" #define DIRHASH_BUCKETS 4096 |