diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-09-30 16:16:22 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-09-30 16:16:22 +0000 |
| commit | 0f47e18d292280236e38db2c8a6d30634ab9a008 (patch) | |
| tree | bf12b8304dad7e4ce824e72b20fc5dc6a838b5dd /libexec | |
| parent | 08c048084a51b7d68ab0c4df267aafb7550e5d47 (diff) | |
Always say "User %s access denied", in all cases, to avoid some stupid
spinny things which parse those messages. Do not close the connection
as requested by Josh Grosse, since a 530 is not supposed to do that.
ok millert
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 2385f824c4b..797a3ea0dc7 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.184 2008/09/12 16:12:08 moritz Exp $ */ +/* $OpenBSD: ftpd.c,v 1.185 2008/09/30 16:16:21 deraadt 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.184 2008/09/12 16:12:08 moritz Exp $"; + "$OpenBSD: ftpd.c,v 1.185 2008/09/30 16:16:21 deraadt Exp $"; #endif #endif /* not lint */ @@ -824,10 +824,7 @@ user(char *name) dochroot = (lc && login_getcapbool(lc, "ftp-chroot", 0)) || checkuser(_PATH_FTPCHROOT, name); if (anon_only && !dochroot) { - if (anon_ok) - reply(530, "Sorry, only anonymous ftp allowed."); - else - reply(530, "User %s access denied.", name); + reply(530, "User %s access denied.", name); return; } if (pw) { |