d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement alternative strategy if it is impossible to confirm

Browse Source 
password: ask for it, but don't tell that S/key password required.
It looks like non-s/key system from outside.

Additionally tell that s/key required when it is so for normal case
This commit is contained in:
Andrey A. Chernov 1996-10-18 17:09:26 +00:00
parent 9fe1a5aaab
commit 43658eac64
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libexec/ftpd/extern.h
View File

@ -68,5 +68,5 @@ void user __P((char *));
void yyerror __P((char *));
int yyparse __P((void));
#if defined(SKEY) && defined(_PWD_H_) /* XXX evil */
char *skey_challenge __P((char *, struct passwd *, int, int *));
char *skey_challenge __P((char *, struct passwd *, int));
#endif

13
libexec/ftpd/ftpd.c
View File

@ -182,7 +182,6 @@ char proctitle[LINE_MAX]; /* initial part of title */
#ifdef SKEY
int pwok = 0;
int sflag;
char addr_string[20]; /* XXX */
#endif
@ -628,17 +627,7 @@ user(name)
strncpy(curname, name, sizeof(curname)-1);
#ifdef SKEY
pwok = skeyaccess(name, NULL, remotehost, addr_string);
cp = skey_challenge(name, pw, pwok, &sflag);
if (!pwok && sflag) {
reply(530, cp);
if (logging)
syslog(LOG_NOTICE,
"FTP LOGIN REFUSED FROM %s, %s",
remotehost, name);
pw = (struct passwd *) NULL;
return;
}
reply(331, cp);
reply(331, "%s", skey_challenge(name, pw, pwok));
#else
reply(331, "Password required for %s.", name);
#endif

16
libexec/ftpd/skey-stuff.c
View File

@ -1,6 +1,6 @@
/* Author: Wietse Venema, Eindhoven University of Technology.
*
* $Id: skey-stuff.c,v 1.4 1996/10/17 17:06:04 ache Exp $
* $Id: skey-stuff.c,v 1.3 1996/09/22 21:53:34 wosch Exp $
*/
#include <stdio.h>
@ -10,21 +10,19 @@
/* skey_challenge - additional password prompt stuff */
char *skey_challenge(name, pwd, pwok, sflag)
char *skey_challenge(name, pwd, pwok)
char *name;
struct passwd *pwd;
int pwok;
int *sflag;
int pwok;
{
static char buf[128];
struct skey skey;
char *username = pwd ? pwd->pw_name : ":";
/* Display s/key challenge where appropriate. */
*sflag = skeychallenge(&skey, username, buf);
if (*sflag)
sprintf(buf, "%s required for %s.",
pwok ? "Password" : "S/Key password", name);
if (pwd == NULL || skeychallenge(&skey, pwd->pw_name, buf))
sprintf(buf, "Password required for %s.", name);
else if (!pwok)
strcat(buf, " (s/key required)");
return (buf);
}