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

recommit rev 1.5 of ftpd, I fatfingered a command

Browse Source
This commit is contained in:
Paul Traina 1994-10-27 19:36:01 +00:00
parent 179ead2d5b
commit 2c60c54cc4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libexec/ftpd/ftpd.c
View File

@ -77,6 +77,10 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#ifdef SKEY
#include <skey.h>
#endif
#include "pathnames.h" #include "pathnames.h"
#include "extern.h" #include "extern.h"
@ -143,8 +147,7 @@ char proctitle[LINE_MAX]; /* initial part of title */
#ifdef SKEY #ifdef SKEY
int pwok = 0; int pwok = 0;
char *skey_challenge(); char addr_string[20]; /* XXX */
char *skey_crypt();
#endif #endif
#define LOGCMD(cmd, file) \ #define LOGCMD(cmd, file) \
@ -205,6 +208,8 @@ main(argc, argv, envp)
char *cp, line[LINE_MAX]; char *cp, line[LINE_MAX];
FILE *fd; FILE *fd;
tzset(); /* in case no timezone database in ~ftp */
/* /*
* LOG_NDELAY sets up the logging connection immediately, * LOG_NDELAY sets up the logging connection immediately,
* necessary for anonymous ftp's that chroot and can't do it later. * necessary for anonymous ftp's that chroot and can't do it later.
@ -215,6 +220,9 @@ main(argc, argv, envp)
syslog(LOG_ERR, "getpeername (%s): %m",argv[0]); syslog(LOG_ERR, "getpeername (%s): %m",argv[0]);
exit(1); exit(1);
} }
#ifdef SKEY
strcpy(addr_string, inet_ntoa(his_addr.sin_addr));
#endif
addrlen = sizeof(ctrl_addr); addrlen = sizeof(ctrl_addr);
if (getsockname(0, (struct sockaddr *)&ctrl_addr, &addrlen) < 0) { if (getsockname(0, (struct sockaddr *)&ctrl_addr, &addrlen) < 0) {
syslog(LOG_ERR, "getsockname (%s): %m",argv[0]); syslog(LOG_ERR, "getsockname (%s): %m",argv[0]);
@ -434,7 +442,7 @@ user(name)
guest = 1; guest = 1;
askpasswd = 1; askpasswd = 1;
reply(331, reply(331,
"Guest login ok, type your name as password."); "Guest login ok, send your email address as password.");
} else } else
reply(530, "User %s unknown.", name); reply(530, "User %s unknown.", name);
if (!askpasswd && logging) if (!askpasswd && logging)
@ -463,7 +471,7 @@ user(name)
if (logging) if (logging)
strncpy(curname, name, sizeof(curname)-1); strncpy(curname, name, sizeof(curname)-1);
#ifdef SKEY #ifdef SKEY
pwok = skeyaccess(name, NULL, remotehost); pwok = skeyaccess(name, NULL, remotehost, addr_string);
reply(331, "%s", skey_challenge(name, pw, pwok)); reply(331, "%s", skey_challenge(name, pw, pwok));
#else #else
reply(331, "Password required for %s.", name); reply(331, "Password required for %s.", name);