diff options
| author | Moritz Jodeit <moritz@cvs.openbsd.org> | 2005-07-14 14:48:48 +0000 |
|---|---|---|
| committer | Moritz Jodeit <moritz@cvs.openbsd.org> | 2005-07-14 14:48:48 +0000 |
| commit | 28cfc2e4e3b35c093b61089422cf0347e7df0890 (patch) | |
| tree | 2ee8d2c09004b443d3d6d34b5ef03a78cfdc0de1 /libexec/ftpd/ftpd.c | |
| parent | 360daa1c380cde584c12fbc861a2b4ebcda22f3a (diff) | |
let root create the data socket. fixes PR 4287.
ok millert@ henning@
Diffstat (limited to 'libexec/ftpd/ftpd.c')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 06e05a0f3b3..f012c297560 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.166 2005/05/24 02:24:57 moritz Exp $ */ +/* $OpenBSD: ftpd.c,v 1.167 2005/07/14 14:48:47 moritz Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -70,7 +70,7 @@ static const char copyright[] = static const char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #else static const char rcsid[] = - "$OpenBSD: ftpd.c,v 1.166 2005/05/24 02:24:57 moritz Exp $"; + "$OpenBSD: ftpd.c,v 1.167 2005/07/14 14:48:47 moritz Exp $"; #endif #endif /* not lint */ @@ -1306,7 +1306,7 @@ getdatasock(char *mode) if (data >= 0) return (fdopen(data, mode)); sigprocmask (SIG_BLOCK, &allsigs, NULL); - s = socket(ctrl_addr.su_family, SOCK_STREAM, 0); + s = monitor_socket(ctrl_addr.su_family); if (s < 0) goto bad; if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, |