Only try clear-text password if S/Key said we could.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@589 ec53bebd-3082-4978-b11e-865c3cabbd6b

appl/ftp/ftpd/ftpd.c

@@ -736,9 +736,6 @@ pass(char *passwd)
 			rval = 1;	/* failure below */
 			goto skip;
 		}
-		rval = klogin(pw->pw_name, passwd);
-		if (rval == 0)
-			goto skip;
 #ifdef SKEY
 		if (skeyverify (&sk, passwd) == 0) {
 			rval = 0;
@@ -748,6 +745,10 @@ pass(char *passwd)
 			goto skip;
 		}
 #endif
+		rval = klogin(pw->pw_name, passwd);
+		if (rval == 0)
+			goto skip;
+
 		/* the strcmp does not catch null passwords! */
 		if (pw == NULL || *pw->pw_passwd == 0 ||
 		    strcmp((char*)crypt(passwd, pw->pw_passwd), pw->pw_passwd)){