diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2011-05-16 21:05:53 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2011-05-16 21:05:53 +0000 |
| commit | 5e214bf2f9e80611a8b62614bf245d0b6df10679 (patch) | |
| tree | 902c5b4dfdb9664269ef442febf2685a0af86442 /usr.sbin/smtpd/smtpd.c | |
| parent | ad8f46c8f3c15f2ba7e47cdbdc8495a754b0bff9 (diff) | |
murder struct path and make sure smtpd uses simpler structures that do not
bring a shitload of unnecessary information everywhere. this required many
parts of smtpd to be refactored and more specifically envelope expansion.
in the process lots of code got simplified, and the envelope expansion code
has been isolated to lka_session.c with some longstanding bugs fixed.
Diff has been tested by many with no major regression reported.
armani@ spotted a bug in a setup where a domain is listed a both primary
and virtual, I will fix that in-tree as it's becoming painful to maintain
this diff out.
Diffstat (limited to 'usr.sbin/smtpd/smtpd.c')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index c33acb4e183..38d932c1411 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.123 2011/05/04 20:45:30 eric Exp $ */ +/* $OpenBSD: smtpd.c,v 1.124 2011/05/16 21:05:52 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -109,7 +109,7 @@ parent_imsg(struct imsgev *iev, struct imsg *imsg) switch (imsg->hdr.type) { case IMSG_PARENT_FORWARD_OPEN: fwreq = imsg->data; - fd = parent_forward_open(fwreq->pw_name); + fd = parent_forward_open(fwreq->as_user); fwreq->status = 0; if (fd == -2) { /* no ~/.forward, however it's optional. */ |