oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

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

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@589 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1996-06-15 21:22:52 +00:00
parent 87eaafe07a
commit 027d20a22a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
appl/ftp/ftpd/ftpd.c
View File

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