diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-03-08 17:54:21 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-03-08 17:54:21 +0000 |
| commit | 0d7903fa953304a8193884b221242d4de81f8fdf (patch) | |
| tree | 2df7f9ccc02ffe0ef90d08d0a77904afef8b8b11 /usr.sbin/smtpd/smtpd.c | |
| parent | 8bf8b25918bb1c74ae807996c744e3d08724ad07 (diff) | |
~/.forward files handling was fixed recently so that it is the privileged
process that does the opening, this commit does some cleanup, and fixes a
bug I experienced today which was caused by a use-after-free.
I did some testing to make sure a user cannot cause smtpd to deadlock, or
loop, with broken setups (self-referencing forwards/aliases, empty files,
broken files...), but if you are playing with aliases/forwards PLEASE let
me know of any bug you run into.
Diffstat (limited to 'usr.sbin/smtpd/smtpd.c')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index 98b4bdade42..6d3217e8683 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.41 2009/03/04 00:00:40 gilles Exp $ */ +/* $OpenBSD: smtpd.c,v 1.42 2009/03/08 17:54:20 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -200,7 +200,6 @@ parent_dispatch_lka(int fd, short event, void *p) if (ret == -1) if (errno == ENOENT) fwreq->pw_name[0] = '\0'; - log_debug("parent will return fd %d", ret); imsg_compose(ibuf, IMSG_PARENT_FORWARD_OPEN, 0, 0, ret, fwreq, sizeof(*fwreq)); break; } |