Properly reset states when a login phase is interrupted by another one.

Prevents ftpd from letting regular users logging in during anonymous-only
mode (-A).

ok millert, ray

diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 500cb93..ec10610 100644 (file)
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ftpd.c,v 1.190 2010/07/30 11:02:56 ray Exp $  */
+/*     $OpenBSD: ftpd.c,v 1.191 2010/08/01 16:53:57 tobias Exp $       */
 /*     $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $        */
 
 /*
@@ -733,6 +733,7 @@ user(char *name)
                *style++ = 0;
 
        guest = 0;
+       askpasswd = 0;
        host = multihome ? dhostname : hostname;
        if (anon_ok &&
            (strcmp(name, "ftp") == 0 || strcmp(name, "anonymous") == 0)) {