diff options
| author | Moritz Jodeit <moritz@cvs.openbsd.org> | 2005-05-24 02:12:41 +0000 |
|---|---|---|
| committer | Moritz Jodeit <moritz@cvs.openbsd.org> | 2005-05-24 02:12:41 +0000 |
| commit | 5be0651f0bad42da3923ef185dff8c0c9e8e73a4 (patch) | |
| tree | da4991532e381929e60b011d797bcae00ea32347 /libexec | |
| parent | 4e6b39188f9985d1de0b77fa88cc9c89377a1125 (diff) | |
no need for endpwent()
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 5 | ||||
| -rw-r--r-- | libexec/ftpd/monitor.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 3641aba9848..da89815db3b 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.164 2005/04/21 00:12:20 deraadt Exp $ */ +/* $OpenBSD: ftpd.c,v 1.165 2005/05/24 02:12:40 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.164 2005/04/21 00:12:20 deraadt Exp $"; + "$OpenBSD: ftpd.c,v 1.165 2005/05/24 02:12:40 moritz Exp $"; #endif #endif /* not lint */ @@ -392,7 +392,6 @@ main(int argc, char *argv[]) FTPD_PRIVSEP_USER); exit(1); } - endpwent(); if (daemon_mode) { int *fds, n, error, i, fd; diff --git a/libexec/ftpd/monitor.c b/libexec/ftpd/monitor.c index 4a3d4e500c8..ea596e5072a 100644 --- a/libexec/ftpd/monitor.c +++ b/libexec/ftpd/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.8 2005/02/26 17:35:05 moritz Exp $ */ +/* $OpenBSD: monitor.c,v 1.9 2005/05/24 02:12:40 moritz Exp $ */ /* * Copyright (c) 2004 Moritz Jodeit <moritz@openbsd.org> @@ -174,7 +174,6 @@ monitor_init(void) if ((pw = getpwnam(FTPD_PRIVSEP_USER)) == NULL) fatalx("privilege separation user %s not found", FTPD_PRIVSEP_USER); - endpwent(); if (chroot(pw->pw_dir) == -1) fatalx("chroot %s: %m", pw->pw_dir); |