diff options
| author | pst <pst@FreeBSD.org> | 1994-09-29 18:59:42 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1994-09-29 18:59:42 +0000 |
| commit | 02b021a2a7128086be276505669acb339aaa9d4f (patch) | |
| tree | 32e118df764c72fe51f631d167b60f637e565515 /libexec/ftpd | |
| parent | fa66532d9315e27eada285f0d645176216a99ec0 (diff) | |
| download | FreeBSD-src-02b021a2a7128086be276505669acb339aaa9d4f.zip FreeBSD-src-02b021a2a7128086be276505669acb339aaa9d4f.tar.gz | |
Use new skey access routines
Diffstat (limited to 'libexec/ftpd')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index ce9ac59..93bd67b 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -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 |
