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

Use new skey access routines

Browse Source
This commit is contained in:
Paul Traina 1994-09-29 18:59:42 +00:00
parent c9bdc15213
commit bb56d435e3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=3206
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libexec/ftpd/ftpd.c
View File

@ -204,9 +204,6 @@ main(argc, argv, envp)
int addrlen, ch, on = 1, tos;
char *cp, line[LINE_MAX];
FILE *fd;
#ifdef SKEY
char addr_string[20]; /* XXX */
#endif
/*
* LOG_NDELAY sets up the logging connection immediately,
@ -218,10 +215,6 @@ main(argc, argv, envp)
syslog(LOG_ERR, "getpeername (%s): %m",argv[0]);
exit(1);
}
#ifdef SKEY
strcpy(addr_string, inet_ntoa(his_addr.sin_addr));
pwok = authfile(addr_string);
#endif
addrlen = sizeof(ctrl_addr);
if (getsockname(0, (struct sockaddr *)&ctrl_addr, &addrlen) < 0) {
syslog(LOG_ERR, "getsockname (%s): %m",argv[0]);
@ -470,6 +463,7 @@ user(name)
if (logging)
strncpy(curname, name, sizeof(curname)-1);
#ifdef SKEY
pwok = skeyaccess(name, NULL, remotehost);
reply(331, "%s", skey_challenge(name, pw, pwok));
#else
reply(331, "Password required for %s.", name);
@ -545,6 +539,7 @@ pass(passwd)
salt = pw->pw_passwd;
#ifdef SKEY
xpasswd = skey_crypt(passwd, salt, pw, pwok);
pwok = 0;
#else
xpasswd = crypt(passwd, salt);
#endif