diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2013-07-19 11:14:09 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2013-07-19 11:14:09 +0000 |
| commit | e69f8efeb851880afaf846c6c6f9ab4f0fb25226 (patch) | |
| tree | 33347af75abf372ce6faa6f682a058b17ae70346 /usr.sbin/smtpd/smtpctl.c | |
| parent | 6fff6905b9aa3bc12806712cb01ed4cbeb444ea7 (diff) | |
Get rid of env->sc_pw and env->sc_pwqueue. Early queue initialization
now happens in queue_init(), and backends take the queue passwd as
parameter in their init function.
Remove useless SMTPD_FILTER_USER while there.
Diffstat (limited to 'usr.sbin/smtpd/smtpctl.c')
| -rw-r--r-- | usr.sbin/smtpd/smtpctl.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c index d0ee54a419e..ea1926fc129 100644 --- a/usr.sbin/smtpd/smtpctl.c +++ b/usr.sbin/smtpd/smtpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpctl.c,v 1.104 2013/05/24 17:03:14 eric Exp $ */ +/* $OpenBSD: smtpctl.c,v 1.105 2013/07/19 11:14:08 eric Exp $ */ /* * Copyright (c) 2006 Gilles Chehade <gilles@poolp.org> @@ -102,19 +102,6 @@ setup_env(struct smtpd *smtpd) bzero(smtpd, sizeof (*smtpd)); env = smtpd; - if ((env->sc_pw = getpwnam(SMTPD_USER)) == NULL) - errx(1, "unknown user %s", SMTPD_USER); - if ((env->sc_pw = pw_dup(env->sc_pw)) == NULL) - err(1, NULL); - - env->sc_pwqueue = getpwnam(SMTPD_QUEUE_USER); - if (env->sc_pwqueue) - env->sc_pwqueue = pw_dup(env->sc_pwqueue); - else - env->sc_pwqueue = pw_dup(env->sc_pw); - if (env->sc_pwqueue == NULL) - err(1, NULL); - if (!queue_init("fs", 0)) errx(1, "invalid directory permissions"); } |