BSD 4_3_Reno release

[unix-history] / usr / src / libexec / ftpd / ftpd.c

diff --git a/usr/src/libexec/ftpd/ftpd.c b/usr/src/libexec/ftpd/ftpd.c
index b551f54..1c5f751 100644 (file)
--- a/usr/src/libexec/ftpd/ftpd.c
+++ b/usr/src/libexec/ftpd/ftpd.c
@@ -1,6 +1,31 @@
+/*
+ * Copyright (c) 1985, 1988, 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * Neither the name of the University nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)ftpd.c     4.13 (Berkeley) %G%";
-#endif
+char copyright[] =
+"@(#) Copyright (c) 1985, 1988, 1990 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)ftpd.c     5.37 (Berkeley) 6/27/90";
+#endif /* not lint */

 
 /*
  * FTP server.
 
 /*
  * FTP server.


@@ -9,232 +34,474 @@ static char sccsid[] = "@(#)ftpd.c 4.13 (Berkeley) %G%";
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>

+#include <sys/file.h>
+#include <sys/wait.h>
+#include <sys/dir.h>

 
 #include <netinet/in.h>
 
 #include <netinet/in.h>

+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+
+#define        FTP_NAMES
+#include <arpa/ftp.h>
+#include <arpa/inet.h>
+#include <arpa/telnet.h>

 
 

+#include <ctype.h>

 #include <stdio.h>
 #include <signal.h>
 #include <stdio.h>
 #include <signal.h>

-#include <wait.h>

 #include <pwd.h>
 #include <setjmp.h>
 #include <netdb.h>
 #include <errno.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <netdb.h>
 #include <errno.h>

+#include <string.h>
+#include <syslog.h>
+#include <varargs.h>
+#include "pathnames.h"

 
 

-#include "ftp.h"
-
+/*
+ * File containing login names
+ * NOT to be used on this machine.
+ * Commonly used to disallow uucp.
+ */

 extern int errno;
 extern int errno;

-extern char *sys_errlist[];

 extern char *crypt();
 extern char version[];
 extern char *home;             /* pointer to home directory for glob */
 extern char *crypt();
 extern char version[];
 extern char *home;             /* pointer to home directory for glob */

-extern FILE *popen(), *fopen();
-extern int pclose(), fclose();
+extern FILE *ftpd_popen(), *fopen(), *freopen();
+extern int  ftpd_pclose(), fclose();
+extern char *getline();
+extern char cbuf[];
+extern off_t restart_point;

 
 struct sockaddr_in ctrl_addr;
 struct sockaddr_in data_source;
 struct sockaddr_in data_dest;
 struct sockaddr_in his_addr;
 
 struct sockaddr_in ctrl_addr;
 struct sockaddr_in data_source;
 struct sockaddr_in data_dest;
 struct sockaddr_in his_addr;

-
-struct hostent *hp;
+struct sockaddr_in pasv_addr;

 
 int    data;
 
 int    data;

-jmp_buf        errcatch;
+jmp_buf        errcatch, urgcatch;

 int    logged_in;
 struct passwd *pw;
 int    debug;
 int    logged_in;
 struct passwd *pw;
 int    debug;

-int    logging = 1;
+int    timeout = 900;    /* timeout after 15 minutes of inactivity */
+int    maxtimeout = 7200;/* don't allow idle time to be set beyond 2 hours */
+int    logging;

 int    guest;
 int    type;
 int    form;
 int    stru;                   /* avoid C keyword */
 int    mode;
 int    usedefault = 1;         /* for data transfers */
 int    guest;
 int    type;
 int    form;
 int    stru;                   /* avoid C keyword */
 int    mode;
 int    usedefault = 1;         /* for data transfers */

-char   hostname[32];
-char   *remotehost;
-struct servent *sp;
+int    pdata = -1;             /* for passive mode */
+int    transflag;
+off_t  file_size;
+off_t  byte_count;
+#if !defined(CMASK) || CMASK == 0
+#undef CMASK
+#define CMASK 027
+#endif
+int    defumask = CMASK;               /* default umask value */
+char   tmpline[7];
+char   hostname[MAXHOSTNAMELEN];
+char   remotehost[MAXHOSTNAMELEN];
+
+/*
+ * Timeout intervals for retrying connections
+ * to hosts that don't accept PORT cmds.  This
+ * is a kludge, but given the problems with TCP...
+ */
+#define        SWAITMAX        90      /* wait at most 90 seconds */
+#define        SWAITINT        5       /* interval between retries */
+
+int    swaitmax = SWAITMAX;
+int    swaitint = SWAITINT;

 
 int    lostconn();
 
 int    lostconn();

-int    reapchild();
+int    myoob();

 FILE   *getdatasock(), *dataconn();
 FILE   *getdatasock(), *dataconn();

-char   *ntoa();

 
 

-main(argc, argv)
+#ifdef SETPROCTITLE
+char   **Argv = NULL;          /* pointer to argument vector */
+char   *LastArgv = NULL;       /* end of argv */
+char   proctitle[BUFSIZ];      /* initial part of title */
+#endif /* SETPROCTITLE */
+
+main(argc, argv, envp)

        int argc;
        char *argv[];
        int argc;
        char *argv[];

+       char **envp;

 {
 {

-       int ctrl, s, options = 0;
+       int addrlen, on = 1, tos;

        char *cp;
 
        char *cp;
 

-       sp = getservbyname("ftp", "tcp");
-       if (sp == 0) {
-               fprintf(stderr, "ftpd: fpt/tcp: unknown service\n");
+       addrlen = sizeof (his_addr);
+       if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
+               syslog(LOG_ERR, "getpeername (%s): %m",argv[0]);
+               exit(1);
+       }
+       addrlen = sizeof (ctrl_addr);
+       if (getsockname(0, (struct sockaddr *)&ctrl_addr, &addrlen) < 0) {
+               syslog(LOG_ERR, "getsockname (%s): %m",argv[0]);

                exit(1);
        }
                exit(1);
        }

-       ctrl_addr.sin_port = sp->s_port;
-       data_source.sin_port = htons(ntohs(sp->s_port) - 1);
-       signal(SIGPIPE, lostconn);
+#ifdef IP_TOS
+       tos = IPTOS_LOWDELAY;
+       if (setsockopt(0, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
+               syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
+#endif
+       data_source.sin_port = htons(ntohs(ctrl_addr.sin_port) - 1);

        debug = 0;
        debug = 0;

+       openlog("ftpd", LOG_PID, LOG_DAEMON);
+#ifdef SETPROCTITLE
+       /*
+        *  Save start and extent of argv for setproctitle.
+        */
+       Argv = argv;
+       while (*envp)
+               envp++;
+       LastArgv = envp[-1] + strlen(envp[-1]);
+#endif /* SETPROCTITLE */
+

        argc--, argv++;
        while (argc > 0 && *argv[0] == '-') {
                for (cp = &argv[0][1]; *cp; cp++) switch (*cp) {
 
        argc--, argv++;
        while (argc > 0 && *argv[0] == '-') {
                for (cp = &argv[0][1]; *cp; cp++) switch (*cp) {
 

+               case 'v':
+                       debug = 1;
+                       break;
+

                case 'd':
                        debug = 1;
                case 'd':
                        debug = 1;

-                       options |= SO_DEBUG;

                        break;
 
                        break;
 

+               case 'l':
+                       logging = 1;
+                       break;
+
+               case 't':
+                       timeout = atoi(++cp);
+                       if (maxtimeout < timeout)
+                               maxtimeout = timeout;
+                       goto nextopt;
+
+               case 'T':
+                       maxtimeout = atoi(++cp);
+                       if (timeout > maxtimeout)
+                               timeout = maxtimeout;
+                       goto nextopt;
+
+               case 'u':
+                   {
+                       int val = 0;
+
+                       while (*++cp && *cp >= '0' && *cp <= '9')
+                               val = val*8 + *cp - '0';
+                       if (*cp)
+                               fprintf(stderr, "ftpd: Bad value for -u\n");
+                       else
+                               defumask = val;
+                       goto nextopt;
+                   }
+

                default:
                default:

-                       fprintf(stderr, "Unknown flag -%c ignored.\n", cp);
+                       fprintf(stderr, "ftpd: Unknown flag -%c ignored.\n",
+                            *cp);

                        break;
                }
                        break;
                }

+nextopt:

                argc--, argv++;
        }
                argc--, argv++;
        }

-#ifndef DEBUG
-       if (fork())
-               exit(0);
-       for (s = 0; s < 10; s++)
-               (void) close(s);
-       (void) open("/dev/null", 0);
-       (void) dup2(0, 1);
-       { int tt = open("/dev/tty", 2);
-         if (tt > 0) {
-               ioctl(tt, TIOCNOTTY, 0);
-               close(tt);
-         }
-       }
+       (void) freopen(_PATH_DEVNULL, "w", stderr);
+       (void) signal(SIGPIPE, lostconn);
+       (void) signal(SIGCHLD, SIG_IGN);
+       if ((int)signal(SIGURG, myoob) < 0)
+               syslog(LOG_ERR, "signal: %m");
+
+       /* Try to handle urgent data inline */
+#ifdef SO_OOBINLINE
+       if (setsockopt(0, SOL_SOCKET, SO_OOBINLINE, (char *)&on, sizeof(on)) < 0)
+               syslog(LOG_ERR, "setsockopt: %m");

 #endif
 #endif

-       while ((s = socket(AF_INET, SOCK_STREAM, 0, 0)) < 0) {
-               perror("ftpd: socket");
-               sleep(5);
-       }
-       if (options & SO_DEBUG)
-               if (setsockopt(s, SOL_SOCKET, SO_DEBUG, 0, 0) < 0)
-                       perror("ftpd: setsockopt (SO_DEBUG)");
-#ifdef notdef
-       if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, 0, 0) < 0)
-               perror("ftpd: setsockopt (SO_KEEPALIVE)");
+
+#ifdef F_SETOWN
+       if (fcntl(fileno(stdin), F_SETOWN, getpid()) == -1)
+               syslog(LOG_ERR, "fcntl F_SETOWN: %m");

 #endif
 #endif

-       while (bind(s, &ctrl_addr, sizeof (ctrl_addr), 0) < 0) {
-               perror("ftpd: bind");
-               sleep(5);
-       }
-       sigset(SIGCHLD, reapchild);
-       listen(s, 10);
-       for (;;) {
-               int hisaddrlen = sizeof (his_addr);
-
-               ctrl = accept(s, &his_addr, &hisaddrlen, 0);
-               if (ctrl < 0) {
-                       if (errno == EINTR)
-                               continue;
-                       perror("ftpd: accept");
-                       continue;
+       dolog(&his_addr);
+       /*
+        * Set up default state
+        */
+       data = -1;
+       type = TYPE_A;
+       form = FORM_N;
+       stru = STRU_F;
+       mode = MODE_S;
+       tmpline[0] = '\0';
+       (void) gethostname(hostname, sizeof (hostname));
+       reply(220, "%s FTP server (%s) ready.", hostname, version);
+       (void) setjmp(errcatch);
+       for (;;)
+               (void) yyparse();
+       /* NOTREACHED */
+}
+
+lostconn()
+{
+
+       if (debug)
+               syslog(LOG_DEBUG, "lost connection");
+       dologout(-1);
+}
+
+static char ttyline[20];
+
+/*
+ * Helper function for sgetpwnam().
+ */
+char *
+sgetsave(s)
+       char *s;
+{
+       char *malloc();
+       char *new = malloc((unsigned) strlen(s) + 1);
+
+       if (new == NULL) {
+               perror_reply(421, "Local resource failure: malloc");
+               dologout(1);
+               /* NOTREACHED */
+       }
+       (void) strcpy(new, s);
+       return (new);
+}
+
+/*
+ * Save the result of a getpwnam.  Used for USER command, since
+ * the data returned must not be clobbered by any other command
+ * (e.g., globbing).
+ */
+struct passwd *
+sgetpwnam(name)
+       char *name;
+{
+       static struct passwd save;
+       register struct passwd *p;
+       char *sgetsave();
+
+       if ((p = getpwnam(name)) == NULL)
+               return (p);
+       if (save.pw_name) {
+               free(save.pw_name);
+               free(save.pw_passwd);
+               free(save.pw_gecos);
+               free(save.pw_dir);
+               free(save.pw_shell);
+       }
+       save = *p;
+       save.pw_name = sgetsave(p->pw_name);
+       save.pw_passwd = sgetsave(p->pw_passwd);
+       save.pw_gecos = sgetsave(p->pw_gecos);
+       save.pw_dir = sgetsave(p->pw_dir);
+       save.pw_shell = sgetsave(p->pw_shell);
+       return (&save);
+}
+
+int login_attempts;            /* number of failed login attempts */
+int askpasswd;                 /* had user command, ask for passwd */
+
+/*
+ * USER command.
+ * Sets global passwd pointer pw if named account exists and is acceptable;
+ * sets askpasswd if a PASS command is expected.  If logged in previously,
+ * need to reset state.  If name is "ftp" or "anonymous", the name is not in
+ * _PATH_FTPUSERS, and ftp account exists, set guest and pw, then just return.
+ * If account doesn't exist, ask for passwd anyway.  Otherwise, check user
+ * requesting login privileges.  Disallow anyone who does not have a standard
+ * shell as returned by getusershell().  Disallow anyone mentioned in the file
+ * _PATH_FTPUSERS to allow people such as root and uucp to be avoided.
+ */
+user(name)
+       char *name;
+{
+       register char *cp;
+       char *shell;
+       char *getusershell();
+
+       if (logged_in) {
+               if (guest) {
+                       reply(530, "Can't change user from guest login.");
+                       return;

                }
                }

-               if (fork() == 0) {
+               end_login();
+       }
+
+       guest = 0;
+       if (strcmp(name, "ftp") == 0 || strcmp(name, "anonymous") == 0) {
+               if (checkuser("ftp") || checkuser("anonymous"))
+                       reply(530, "User %s access denied.", name);
+               else if ((pw = sgetpwnam("ftp")) != NULL) {
+                       guest = 1;
+                       askpasswd = 1;
+                       reply(331, "Guest login ok, send ident as password.");
+               } else
+                       reply(530, "User %s unknown.", name);
+               return;
+       }
+       if (pw = sgetpwnam(name)) {
+               if ((shell = pw->pw_shell) == NULL || *shell == 0)
+                       shell = _PATH_BSHELL;
+               while ((cp = getusershell()) != NULL)
+                       if (strcmp(cp, shell) == 0)
+                               break;
+               endusershell();
+               if (cp == NULL || checkuser(name)) {
+                       reply(530, "User %s access denied.", name);

                        if (logging)
                        if (logging)

-                               dolog(&his_addr);
-                       close(s);
-                       dup2(ctrl, 0), close(ctrl), dup2(0, 1);
-                       /* do telnet option negotiation here */
-                       /*
-                        * Set up default state
-                        */
-                       logged_in = 0;
-                       data = -1;
-                       type = TYPE_A;
-                       form = FORM_N;
-                       stru = STRU_F;
-                       mode = MODE_S;
-                       gethostname(hostname, sizeof (hostname));
-                       reply(220, "%s FTP server (%s) ready.",
-                               hostname, version);
-                       for (;;) {
-                               setjmp(errcatch);
-                               yyparse();
-                       }
+                               syslog(LOG_NOTICE,
+                                   "FTP LOGIN REFUSED FROM %s, %s",
+                                   remotehost, name);
+                       pw = (struct passwd *) NULL;
+                       return;

                }
                }

-               close(ctrl);

        }
        }

+       reply(331, "Password required for %s.", name);
+       askpasswd = 1;
+       /*
+        * Delay before reading passwd after first failed
+        * attempt to slow down passwd-guessing programs.
+        */
+       if (login_attempts)
+               sleep((unsigned) login_attempts);

 }
 
 }
 

-reapchild()
+/*
+ * Check if a user is in the file _PATH_FTPUSERS
+ */
+checkuser(name)
+       char *name;

 {
 {

-       union wait status;
-
-       while (wait3(&status, WNOHANG, 0) > 0)
-               ;
+       register FILE *fd;
+       register char *p;
+       char line[BUFSIZ];
+
+       if ((fd = fopen(_PATH_FTPUSERS, "r")) != NULL) {
+               while (fgets(line, sizeof(line), fd) != NULL)
+                       if ((p = index(line, '\n')) != NULL) {
+                               *p = '\0';
+                               if (line[0] == '#')
+                                       continue;
+                               if (strcmp(line, name) == 0)
+                                       return (1);
+                       }
+               (void) fclose(fd);
+       }
+       return (0);

 }
 
 }
 

-lostconn()
+/*
+ * Terminate login as previous user, if any, resetting state;
+ * used when USER command is given or login fails.
+ */
+end_login()

 {
 
 {
 

-       fatal("Connection closed.");
+       (void) seteuid((uid_t)0);
+       if (logged_in)
+               logwtmp(ttyline, "", "");
+       pw = NULL;
+       logged_in = 0;
+       guest = 0;

 }
 
 pass(passwd)
        char *passwd;
 {
 }
 
 pass(passwd)
        char *passwd;
 {

-       char *xpasswd, *savestr();
-       static struct passwd save;
+       char *xpasswd, *salt;

 
 

-       if (logged_in || pw == NULL) {
+       if (logged_in || askpasswd == 0) {

                reply(503, "Login with USER first.");
                return;
        }
                reply(503, "Login with USER first.");
                return;
        }

+       askpasswd = 0;

        if (!guest) {           /* "ftp" is only account allowed no password */
        if (!guest) {           /* "ftp" is only account allowed no password */

-               xpasswd = crypt(passwd, pw->pw_passwd);
-               if (strcmp(xpasswd, pw->pw_passwd) != 0) {
+               if (pw == NULL)
+                       salt = "xx";
+               else
+                       salt = pw->pw_passwd;
+               xpasswd = crypt(passwd, salt);
+               /* The strcmp does not catch null passwords! */
+               if (pw == NULL || *pw->pw_passwd == '\0' ||
+                   strcmp(xpasswd, pw->pw_passwd)) {

                        reply(530, "Login incorrect.");
                        pw = NULL;
                        reply(530, "Login incorrect.");
                        pw = NULL;

+                       if (login_attempts++ >= 5) {
+                               syslog(LOG_NOTICE,
+                                   "repeated login failures from %s",
+                                   remotehost);
+                               exit(0);
+                       }

                        return;
                }
        }
                        return;
                }
        }

-       setegid(pw->pw_gid);
-       initgroups(pw->pw_name, pw->pw_gid);
-       if (chdir(pw->pw_dir)) {
-               reply(550, "User %s: can't change directory to $s.",
-                       pw->pw_name, pw->pw_dir);
-               goto bad;
+       login_attempts = 0;             /* this time successful */
+       (void) setegid((gid_t)pw->pw_gid);
+       (void) initgroups(pw->pw_name, pw->pw_gid);
+
+       /* open wtmp before chroot */
+       (void)sprintf(ttyline, "ftp%d", getpid());
+       logwtmp(ttyline, pw->pw_name, remotehost);
+       logged_in = 1;
+
+       if (guest) {
+               /*
+                * We MUST do a chdir() after the chroot. Otherwise
+                * the old current directory will be accessible as "."
+                * outside the new root!
+                */
+               if (chroot(pw->pw_dir) < 0 || chdir("/") < 0) {
+                       reply(550, "Can't set guest privileges.");
+                       goto bad;
+               }
+       } else if (chdir(pw->pw_dir) < 0) {
+               if (chdir("/") < 0) {
+                       reply(530, "User %s: can't change directory to %s.",
+                           pw->pw_name, pw->pw_dir);
+                       goto bad;
+               } else
+                       lreply(230, "No directory! Logging in with home=/");

        }
        }

-       if (guest && chroot(pw->pw_dir) < 0) {
-               reply(550, "Can't set guest privileges.");
+       if (seteuid((uid_t)pw->pw_uid) < 0) {
+               reply(550, "Can't set uid.");

                goto bad;
        }
                goto bad;
        }

-       if (!guest)
-               reply(230, "User %s logged in.", pw->pw_name);
-       else
+       if (guest) {

                reply(230, "Guest login ok, access restrictions apply.");
                reply(230, "Guest login ok, access restrictions apply.");

-       logged_in = 1;
-       seteuid(pw->pw_uid);
-       /*
-        * Save everything so globbing doesn't
-        * clobber the fields.
-        */
-       save = *pw;
-       save.pw_name = savestr(pw->pw_name);
-       save.pw_passwd = savestr(pw->pw_passwd);
-       save.pw_comment = savestr(pw->pw_comment);
-       save.pw_gecos = savestr(pw->pw_gecos, &save.pw_gecos);
-       save.pw_dir = savestr(pw->pw_dir);
-       save.pw_shell = savestr(pw->pw_shell);
-       pw = &save;
+#ifdef SETPROCTITLE
+               sprintf(proctitle, "%s: anonymous/%.*s", remotehost,
+                   sizeof(proctitle) - sizeof(remotehost) -
+                   sizeof(": anonymous/"), passwd);
+               setproctitle(proctitle);
+#endif /* SETPROCTITLE */
+               if (logging)
+                       syslog(LOG_INFO, "ANONYMOUS FTP LOGIN FROM %s, %s",
+                           remotehost, passwd);
+       } else {
+               reply(230, "User %s logged in.", pw->pw_name);
+#ifdef SETPROCTITLE
+               sprintf(proctitle, "%s: %s", remotehost, pw->pw_name);
+               setproctitle(proctitle);
+#endif /* SETPROCTITLE */
+               if (logging)
+                       syslog(LOG_INFO, "FTP LOGIN FROM %s, %s",
+                           remotehost, pw->pw_name);
+       }

        home = pw->pw_dir;              /* home dir for globbing */
        home = pw->pw_dir;              /* home dir for globbing */

+       (void) umask(defumask);

        return;
 bad:
        return;
 bad:

-       seteuid(0);
-       pw = NULL;
-}
-
-char *
-savestr(s)
-       char *s;
-{
-       char *malloc();
-       char *new = malloc(strlen(s) + 1);
-       
-       if (new != NULL)
-               strcpy(new, s);
-       return(new);
+       /* Forget all about it... */
+       end_login();

 }
 
 retrieve(cmd, name)
 }
 
 retrieve(cmd, name)


@@ -245,75 +512,119 @@ retrieve(cmd, name)
        int (*closefunc)();
 
        if (cmd == 0) {
        int (*closefunc)();
 
        if (cmd == 0) {

-#ifdef notdef
-               /* no remote command execution -- it's a security hole */
-               if (*name == '!')
-                       fin = popen(name + 1, "r"), closefunc = pclose;
-               else
-#endif
-                       fin = fopen(name, "r"), closefunc = fclose;
+               fin = fopen(name, "r"), closefunc = fclose;
+               st.st_size = 0;

        } else {
                char line[BUFSIZ];
 
        } else {
                char line[BUFSIZ];
 

-               sprintf(line, cmd, name), name = line;
-               fin = popen(line, "r"), closefunc = pclose;
+               (void) sprintf(line, cmd, name), name = line;
+               fin = ftpd_popen(line, "r"), closefunc = ftpd_pclose;
+               st.st_size = -1;
+               st.st_blksize = BUFSIZ;

        }
        if (fin == NULL) {
        }
        if (fin == NULL) {

-               reply(550, "%s: %s.", name, sys_errlist[errno]);
+               if (errno != 0)
+                       perror_reply(550, name);

                return;
        }
                return;
        }

-       st.st_size = 0;

        if (cmd == 0 &&
        if (cmd == 0 &&

-           (stat(name, &st) < 0 || (st.st_mode&S_IFMT) != S_IFREG)) {
+           (fstat(fileno(fin), &st) < 0 || (st.st_mode&S_IFMT) != S_IFREG)) {

                reply(550, "%s: not a plain file.", name);
                goto done;
        }
                reply(550, "%s: not a plain file.", name);
                goto done;
        }

+       if (restart_point) {
+               if (type == TYPE_A) {
+                       register int i, n, c;
+
+                       n = restart_point;
+                       i = 0;
+                       while (i++ < n) {
+                               if ((c=getc(fin)) == EOF) {
+                                       perror_reply(550, name);
+                                       goto done;
+                               }
+                               if (c == '\n')
+                                       i++;
+                       }       
+               } else if (lseek(fileno(fin), restart_point, L_SET) < 0) {
+                       perror_reply(550, name);
+                       goto done;
+               }
+       }

        dout = dataconn(name, st.st_size, "w");
        if (dout == NULL)
                goto done;
        dout = dataconn(name, st.st_size, "w");
        if (dout == NULL)
                goto done;

-       if (send_data(fin, dout) || ferror(dout))
-               reply(550, "%s: %s.", name, sys_errlist[errno]);
-       else
-               reply(226, "Transfer complete.");
-       fclose(dout), data = -1;
+       send_data(fin, dout, st.st_blksize);
+       (void) fclose(dout);
+       data = -1;
+       pdata = -1;

 done:
        (*closefunc)(fin);
 }
 
 done:
        (*closefunc)(fin);
 }
 

-store(name, mode)
+store(name, mode, unique)

        char *name, *mode;
        char *name, *mode;

+       int unique;

 {
        FILE *fout, *din;
 {
        FILE *fout, *din;

-       int (*closefunc)(), dochown = 0;
+       struct stat st;
+       int (*closefunc)();
+       char *gunique();

 
 

-#ifdef notdef
-       /* no remote command execution -- it's a security hole */
-       if (name[0] == '!')
-               fout = popen(&name[1], "w"), closefunc = pclose;
-       else
-#endif
-       {
-               struct stat st;
+       if (unique && stat(name, &st) == 0 &&
+           (name = gunique(name)) == NULL)
+               return;

 
 

-               if (stat(name, &st) < 0)
-                       dochown++;
-               fout = fopen(name, mode), closefunc = fclose;
-       }
+       if (restart_point)
+               mode = "r+w";
+       fout = fopen(name, mode);
+       closefunc = fclose;

        if (fout == NULL) {
        if (fout == NULL) {

-               reply(550, "%s: %s.", name, sys_errlist[errno]);
+               perror_reply(553, name);

                return;
        }
                return;
        }

-       din = dataconn(name, -1, "r");
+       if (restart_point) {
+               if (type == TYPE_A) {
+                       register int i, n, c;
+
+                       n = restart_point;
+                       i = 0;
+                       while (i++ < n) {
+                               if ((c=getc(fout)) == EOF) {
+                                       perror_reply(550, name);
+                                       goto done;
+                               }
+                               if (c == '\n')
+                                       i++;
+                       }       
+                       /*
+                        * We must do this seek to "current" position
+                        * because we are changing from reading to
+                        * writing.
+                        */
+                       if (fseek(fout, 0L, L_INCR) < 0) {
+                               perror_reply(550, name);
+                               goto done;
+                       }
+               } else if (lseek(fileno(fout), restart_point, L_SET) < 0) {
+                       perror_reply(550, name);
+                       goto done;
+               }
+       }
+       din = dataconn(name, (off_t)-1, "r");

        if (din == NULL)
                goto done;
        if (din == NULL)
                goto done;

-       if (receive_data(din, fout) || ferror(fout))
-               reply(550, "%s: %s.", name, sys_errlist[errno]);
-       else
-               reply(226, "Transfer complete.");
-       fclose(din), data = -1;
+       if (receive_data(din, fout) == 0) {
+               if (unique)
+                       reply(226, "Transfer complete (unique file name:%s).",
+                           name);
+               else
+                       reply(226, "Transfer complete.");
+       }
+       (void) fclose(din);
+       data = -1;
+       pdata = -1;

 done:
 done:

-       if (dochown)
-               (void) chown(name, pw->pw_uid, -1);

        (*closefunc)(fout);
 }
 
        (*closefunc)(fout);
 }
 


@@ -321,39 +632,79 @@ FILE *
 getdatasock(mode)
        char *mode;
 {
 getdatasock(mode)
        char *mode;
 {

-       int s;
+       int s, on = 1, tries;

 
        if (data >= 0)
                return (fdopen(data, mode));
 
        if (data >= 0)
                return (fdopen(data, mode));

-       s = socket(AF_INET, SOCK_STREAM, 0, 0);
+       s = socket(AF_INET, SOCK_STREAM, 0);

        if (s < 0)
                return (NULL);
        if (s < 0)
                return (NULL);

-       seteuid(0);
-       if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, 0, 0) < 0)
-               goto bad;
-       if (bind(s, &data_source, sizeof (data_source), 0) < 0)
+       (void) seteuid((uid_t)0);
+       if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+           (char *) &on, sizeof (on)) < 0)

                goto bad;
                goto bad;

-       seteuid(pw->pw_uid);
+       /* anchor socket to avoid multi-homing problems */
+       data_source.sin_family = AF_INET;
+       data_source.sin_addr = ctrl_addr.sin_addr;
+       for (tries = 1; ; tries++) {
+               if (bind(s, (struct sockaddr *)&data_source,
+                   sizeof (data_source)) >= 0)
+                       break;
+               if (errno != EADDRINUSE || tries > 10)
+                       goto bad;
+               sleep(tries);
+       }
+       (void) seteuid((uid_t)pw->pw_uid);
+#ifdef IP_TOS
+       on = IPTOS_THROUGHPUT;
+       if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0)
+               syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
+#endif

        return (fdopen(s, mode));
 bad:
        return (fdopen(s, mode));
 bad:

-       seteuid(pw->pw_uid);
-       close(s);
+       (void) seteuid((uid_t)pw->pw_uid);
+       (void) close(s);

        return (NULL);
 }
 
 FILE *
 dataconn(name, size, mode)
        char *name;
        return (NULL);
 }
 
 FILE *
 dataconn(name, size, mode)
        char *name;

-       int size;
+       off_t size;

        char *mode;
 {
        char sizebuf[32];
        FILE *file;
        char *mode;
 {
        char sizebuf[32];
        FILE *file;

+       int retry = 0, tos;

 
 

-       if (size >= 0)
-               sprintf(sizebuf, " (%d bytes)", size);
+       file_size = size;
+       byte_count = 0;
+       if (size != (off_t) -1)
+               (void) sprintf (sizebuf, " (%ld bytes)", size);

        else
                (void) strcpy(sizebuf, "");
        else
                (void) strcpy(sizebuf, "");

+       if (pdata >= 0) {
+               struct sockaddr_in from;
+               int s, fromlen = sizeof(from);
+
+               s = accept(pdata, (struct sockaddr *)&from, &fromlen);
+               if (s < 0) {
+                       reply(425, "Can't open data connection.");
+                       (void) close(pdata);
+                       pdata = -1;
+                       return(NULL);
+               }
+               (void) close(pdata);
+               pdata = s;
+#ifdef IP_TOS
+               tos = IPTOS_LOWDELAY;
+               (void) setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos,
+                   sizeof(int));
+#endif
+               reply(150, "Opening %s mode data connection for %s%s.",
+                    type == TYPE_A ? "ASCII" : "BINARY", name, sizebuf);
+               return(fdopen(pdata, mode));
+       }

        if (data >= 0) {
                reply(125, "Using existing data connection for %s%s.",
                    name, sizebuf);
        if (data >= 0) {
                reply(125, "Using existing data connection for %s%s.",
                    name, sizebuf);


@@ -366,63 +717,105 @@ dataconn(name, size, mode)
        file = getdatasock(mode);
        if (file == NULL) {
                reply(425, "Can't create data socket (%s,%d): %s.",
        file = getdatasock(mode);
        if (file == NULL) {
                reply(425, "Can't create data socket (%s,%d): %s.",

-                   ntoa(data_source.sin_addr),
-                   ntohs(data_source.sin_port),
-                   sys_errlist[errno]);
+                   inet_ntoa(data_source.sin_addr),
+                   ntohs(data_source.sin_port), strerror(errno));

                return (NULL);
        }
                return (NULL);
        }

-       reply(150, "Opening data connection for %s (%s,%d)%s.",
-           name, ntoa(data_dest.sin_addr.s_addr),
-           ntohs(data_dest.sin_port), sizebuf);

        data = fileno(file);
        data = fileno(file);

-       if (connect(data, &data_dest, sizeof (data_dest), 0) < 0) {
-               reply(425, "Can't build data connection: %s.",
-                   sys_errlist[errno]);
+       while (connect(data, (struct sockaddr *)&data_dest,
+           sizeof (data_dest)) < 0) {
+               if (errno == EADDRINUSE && retry < swaitmax) {
+                       sleep((unsigned) swaitint);
+                       retry += swaitint;
+                       continue;
+               }
+               perror_reply(425, "Can't build data connection");

                (void) fclose(file);
                data = -1;
                return (NULL);
        }
                (void) fclose(file);
                data = -1;
                return (NULL);
        }

+       reply(150, "Opening %s mode data connection for %s%s.",
+            type == TYPE_A ? "ASCII" : "BINARY", name, sizebuf);

        return (file);
 }
 
 /*
  * Tranfer the contents of "instr" to
  * "outstr" peer using the appropriate
        return (file);
 }
 
 /*
  * Tranfer the contents of "instr" to
  * "outstr" peer using the appropriate

- * encapulation of the date subject
+ * encapsulation of the data subject

  * to Mode, Structure, and Type.
  *
  * NB: Form isn't handled.
  */
  * to Mode, Structure, and Type.
  *
  * NB: Form isn't handled.
  */

-send_data(instr, outstr)
+send_data(instr, outstr, blksize)

        FILE *instr, *outstr;
        FILE *instr, *outstr;

+       off_t blksize;

 {
 {

-       register int c;
-       int netfd, filefd, cnt;
-       char buf[BUFSIZ];
+       register int c, cnt;
+       register char *buf;
+       int netfd, filefd;

 
 

+       transflag++;
+       if (setjmp(urgcatch)) {
+               transflag = 0;
+               return;
+       }

        switch (type) {
 
        case TYPE_A:
                while ((c = getc(instr)) != EOF) {
        switch (type) {
 
        case TYPE_A:
                while ((c = getc(instr)) != EOF) {

-                       if (c == '\n')
-                               putc('\r', outstr);
-                       if (putc(c, outstr) == EOF)
-                               return (1);
+                       byte_count++;
+                       if (c == '\n') {
+                               if (ferror(outstr))
+                                       goto data_err;
+                               (void) putc('\r', outstr);
+                       }
+                       (void) putc(c, outstr);

                }
                }

-               return (0);
-               
+               fflush(outstr);
+               transflag = 0;
+               if (ferror(instr))
+                       goto file_err;
+               if (ferror(outstr))
+                       goto data_err;
+               reply(226, "Transfer complete.");
+               return;
+

        case TYPE_I:
        case TYPE_L:
        case TYPE_I:
        case TYPE_L:

+               if ((buf = malloc((u_int)blksize)) == NULL) {
+                       transflag = 0;
+                       perror_reply(451, "Local resource failure: malloc");
+                       return;
+               }

                netfd = fileno(outstr);
                filefd = fileno(instr);
                netfd = fileno(outstr);
                filefd = fileno(instr);

-
-               while ((cnt = read(filefd, buf, sizeof (buf))) > 0)
-                       if (write(netfd, buf, cnt) < 0)
-                               return (1);
-               return (cnt < 0);
+               while ((cnt = read(filefd, buf, (u_int)blksize)) > 0 &&
+                   write(netfd, buf, cnt) == cnt)
+                       byte_count += cnt;
+               transflag = 0;
+               (void)free(buf);
+               if (cnt != 0) {
+                       if (cnt < 0)
+                               goto file_err;
+                       goto data_err;
+               }
+               reply(226, "Transfer complete.");
+               return;
+       default:
+               transflag = 0;
+               reply(550, "Unimplemented TYPE %d in send_data", type);
+               return;

        }
        }

-       reply(504,"Unimplemented TYPE %d in send_data", type);
-       return (1);
+
+data_err:
+       transflag = 0;
+       perror_reply(426, "Data connection");
+       return;
+
+file_err:
+       transflag = 0;
+       perror_reply(551, "Error on input file");

 }
 
 /*
 }
 
 /*


@@ -437,48 +830,159 @@ receive_data(instr, outstr)
        FILE *instr, *outstr;
 {
        register int c;
        FILE *instr, *outstr;
 {
        register int c;

-       int cr, escape, eof;
-       int netfd, filefd, cnt;
+       int cnt, bare_lfs = 0;

        char buf[BUFSIZ];
 
        char buf[BUFSIZ];
 

-
+       transflag++;
+       if (setjmp(urgcatch)) {
+               transflag = 0;
+               return (-1);
+       }

        switch (type) {
 
        case TYPE_I:
        case TYPE_L:
        switch (type) {
 
        case TYPE_I:
        case TYPE_L:

-               netfd = fileno(instr);
-               netfd = fileno(outstr);
-               while ((cnt = read(netfd, buf, sizeof buf)) > 0)
-                       if (write(filefd, buf, cnt) < 0)
-                               return (1);
-               return (cnt < 0);
+               while ((cnt = read(fileno(instr), buf, sizeof buf)) > 0) {
+                       if (write(fileno(outstr), buf, cnt) != cnt)
+                               goto file_err;
+                       byte_count += cnt;
+               }
+               if (cnt < 0)
+                       goto data_err;
+               transflag = 0;
+               return (0);

 
        case TYPE_E:
 
        case TYPE_E:

-               reply(504, "TYPE E not implemented.");
-               return (1);
+               reply(553, "TYPE E not implemented.");
+               transflag = 0;
+               return (-1);

 
        case TYPE_A:
 
        case TYPE_A:

-               cr = 0;

                while ((c = getc(instr)) != EOF) {
                while ((c = getc(instr)) != EOF) {

-                       if (cr) {
-                               if (c != '\r' && c != '\n')
-                                       putc('\r', outstr);
-                               putc(c, outstr);
-                               cr = c == '\r';
-                               continue;
-                       }
-                       if (c == '\r') {
-                               cr = 1;
-                               continue;
+                       byte_count++;
+                       if (c == '\n')
+                               bare_lfs++;
+                       while (c == '\r') {
+                               if (ferror(outstr))
+                                       goto data_err;
+                               if ((c = getc(instr)) != '\n') {
+                                       (void) putc ('\r', outstr);
+                                       if (c == '\0' || c == EOF)
+                                               goto contin2;
+                               }

                        }
                        }

-                       putc(c, outstr);
+                       (void) putc(c, outstr);
+       contin2:        ;
+               }
+               fflush(outstr);
+               if (ferror(instr))
+                       goto data_err;
+               if (ferror(outstr))
+                       goto file_err;
+               transflag = 0;
+               if (bare_lfs) {
+                       lreply(230, "WARNING! %d bare linefeeds received in ASCII mode", bare_lfs);
+                       printf("   File may not have transferred correctly.\r\n");

                }
                }

-               if (cr)
-                       putc('\r', outstr);

                return (0);
                return (0);

+       default:
+               reply(550, "Unimplemented TYPE %d in receive_data", type);
+               transflag = 0;
+               return (-1);

        }
        }

-       fatal("Unknown type in receive_data.");
-       /*NOTREACHED*/
+
+data_err:
+       transflag = 0;
+       perror_reply(426, "Data Connection");
+       return (-1);
+
+file_err:
+       transflag = 0;
+       perror_reply(452, "Error writing file");
+       return (-1);
+}
+
+statfilecmd(filename)
+       char *filename;
+{
+       char line[BUFSIZ];
+       FILE *fin;
+       int c;
+
+       (void) sprintf(line, "/bin/ls -lgA %s", filename);
+       fin = ftpd_popen(line, "r");
+       lreply(211, "status of %s:", filename);
+       while ((c = getc(fin)) != EOF) {
+               if (c == '\n') {
+                       if (ferror(stdout)){
+                               perror_reply(421, "control connection");
+                               (void) ftpd_pclose(fin);
+                               dologout(1);
+                               /* NOTREACHED */
+                       }
+                       if (ferror(fin)) {
+                               perror_reply(551, filename);
+                               (void) ftpd_pclose(fin);
+                               return;
+                       }
+                       (void) putc('\r', stdout);
+               }
+               (void) putc(c, stdout);
+       }
+       (void) ftpd_pclose(fin);
+       reply(211, "End of Status");
+}
+
+statcmd()
+{
+       struct sockaddr_in *sin;
+       u_char *a, *p;
+
+       lreply(211, "%s FTP server status:", hostname, version);
+       printf("     %s\r\n", version);
+       printf("     Connected to %s", remotehost);
+       if (!isdigit(remotehost[0]))
+               printf(" (%s)", inet_ntoa(his_addr.sin_addr));
+       printf("\r\n");
+       if (logged_in) {
+               if (guest)
+                       printf("     Logged in anonymously\r\n");
+               else
+                       printf("     Logged in as %s\r\n", pw->pw_name);
+       } else if (askpasswd)
+               printf("     Waiting for password\r\n");
+       else
+               printf("     Waiting for user name\r\n");
+       printf("     TYPE: %s", typenames[type]);
+       if (type == TYPE_A || type == TYPE_E)
+               printf(", FORM: %s", formnames[form]);
+       if (type == TYPE_L)
+#if NBBY == 8
+               printf(" %d", NBBY);
+#else
+               printf(" %d", bytesize);        /* need definition! */
+#endif
+       printf("; STRUcture: %s; transfer MODE: %s\r\n",
+           strunames[stru], modenames[mode]);
+       if (data != -1)
+               printf("     Data connection open\r\n");
+       else if (pdata != -1) {
+               printf("     in Passive mode");
+               sin = &pasv_addr;
+               goto printaddr;
+       } else if (usedefault == 0) {
+               printf("     PORT");
+               sin = &data_dest;
+printaddr:
+               a = (u_char *) &sin->sin_addr;
+               p = (u_char *) &sin->sin_port;
+#define UC(b) (((int) b) & 0xff)
+               printf(" (%d,%d,%d,%d,%d,%d)\r\n", UC(a[0]),
+                       UC(a[1]), UC(a[2]), UC(a[3]), UC(p[0]), UC(p[1]));
+#undef UC
+       } else
+               printf("     No data connection\r\n");
+       reply(211, "End of status");

 }
 
 fatal(s)
 }
 
 fatal(s)


@@ -486,54 +990,44 @@ fatal(s)
 {
        reply(451, "Error in server: %s\n", s);
        reply(221, "Closing connection due to server error.");
 {
        reply(451, "Error in server: %s\n", s);
        reply(221, "Closing connection due to server error.");

-       exit(0);
+       dologout(0);
+       /* NOTREACHED */

 }
 
 }
 

-reply(n, s, args)
+/* VARARGS2 */
+reply(n, fmt, p0, p1, p2, p3, p4, p5)

        int n;
        int n;

-       char *s;
+       char *fmt;

 {
 {

-

        printf("%d ", n);
        printf("%d ", n);

-       _doprnt(s, &args, stdout);
+       printf(fmt, p0, p1, p2, p3, p4, p5);

        printf("\r\n");
        printf("\r\n");

-       fflush(stdout);
+       (void)fflush(stdout);

        if (debug) {
        if (debug) {

-               fprintf(stderr, "<--- %d ", n);
-               _doprnt(s, &args, stderr);
-               fprintf(stderr, "\n");
-               fflush(stderr);
-       }
+               syslog(LOG_DEBUG, "<--- %d ", n);
+               syslog(LOG_DEBUG, fmt, p0, p1, p2, p3, p4, p5);
+}

 }
 
 }
 

-lreply(n, s, args)
+/* VARARGS2 */
+lreply(n, fmt, p0, p1, p2, p3, p4, p5)

        int n;
        int n;

-       char *s;
+       char *fmt;

 {
 {

-       printf("%d-", n);
-       _doprnt(s, &args, stdout);
+       printf("%d- ", n);
+       printf(fmt, p0, p1, p2, p3, p4, p5);

        printf("\r\n");
        printf("\r\n");

-       fflush(stdout);
+       (void)fflush(stdout);

        if (debug) {
        if (debug) {

-               fprintf(stderr, "<--- %d-", n);
-               _doprnt(s, &args, stderr);
-               fprintf(stderr, "\n");
+               syslog(LOG_DEBUG, "<--- %d- ", n);
+               syslog(LOG_DEBUG, fmt, p0, p1, p2, p3, p4, p5);

        }
 }
 
        }
 }
 

-replystr(s)
-       char *s;
-{
-       printf("%s\r\n", s);
-       fflush(stdout);
-       if (debug)
-               fprintf(stderr, "<--- %s\n", s);
-}
-

 ack(s)
        char *s;
 {
 ack(s)
        char *s;
 {

-       reply(200, "%s command okay.", s);
+       reply(250, "%s command successful.", s);

 }
 
 nack(s)
 }
 
 nack(s)


@@ -542,9 +1036,15 @@ nack(s)
        reply(502, "%s command not implemented.", s);
 }
 
        reply(502, "%s command not implemented.", s);
 }
 

-yyerror()
+/* ARGSUSED */
+yyerror(s)
+       char *s;

 {
 {

-       reply(500, "Command not understood.");
+       char *cp;
+
+       if (cp = index(cbuf,'\n'))
+               *cp = '\0';
+       reply(500, "'%s': command not understood.", cbuf);

 }
 
 delete(name)
 }
 
 delete(name)


@@ -553,18 +1053,18 @@ delete(name)
        struct stat st;
 
        if (stat(name, &st) < 0) {
        struct stat st;
 
        if (stat(name, &st) < 0) {

-               reply(550, "%s: %s.", name, sys_errlist[errno]);
+               perror_reply(550, name);

                return;
        }
        if ((st.st_mode&S_IFMT) == S_IFDIR) {
                if (rmdir(name) < 0) {
                return;
        }
        if ((st.st_mode&S_IFMT) == S_IFDIR) {
                if (rmdir(name) < 0) {

-                       reply(550, "%s: %s.", name, sys_errlist[errno]);
+                       perror_reply(550, name);

                        return;
                }
                goto done;
        }
        if (unlink(name) < 0) {
                        return;
                }
                goto done;
        }
        if (unlink(name) < 0) {

-               reply(550, "%s: %s.", name, sys_errlist[errno]);
+               perror_reply(550, name);

                return;
        }
 done:
                return;
        }
 done:


@@ -574,50 +1074,39 @@ done:
 cwd(path)
        char *path;
 {
 cwd(path)
        char *path;
 {

-
-       if (chdir(path) < 0) {
-               reply(550, "%s: %s.", path, sys_errlist[errno]);
-               return;
-       }
-       ack("CWD");
+       if (chdir(path) < 0)
+               perror_reply(550, path);
+       else
+               ack("CWD");

 }
 
 makedir(name)
        char *name;
 {
 }
 
 makedir(name)
        char *name;
 {

-       struct stat st;
-       int dochown = stat(name, &st) < 0;
-       
-       if (mkdir(name, 0777) < 0) {
-               reply(550, "%s: %s.", name, sys_errlist[errno]);
-               return;
-       }
-       if (dochown)
-               (void) chown(name, pw->pw_uid, -1);
-       ack("MKDIR");
+       if (mkdir(name, 0777) < 0)
+               perror_reply(550, name);
+       else
+               reply(257, "MKD command successful.");

 }
 
 removedir(name)
        char *name;
 {
 }
 
 removedir(name)
        char *name;
 {

-
-       if (rmdir(name) < 0) {
-               reply(550, "%s: %s.", name, sys_errlist[errno]);
-               return;
-       }
-       ack("RMDIR");
+       if (rmdir(name) < 0)
+               perror_reply(550, name);
+       else
+               ack("RMD");

 }
 
 pwd()
 {
        char path[MAXPATHLEN + 1];
 }
 
 pwd()
 {
        char path[MAXPATHLEN + 1];

-       char *p;
+       extern char *getwd();

 
 

-       if (getwd(path) == NULL) {
-               reply(451, "%s.", path);
-               return;
-       }
-       reply(251, "\"%s\" is current directory.", path);
+       if (getwd(path) == (char *)NULL)
+               reply(550, "%s.", path);
+       else
+               reply(257, "\"%s\" is current directory.", path);

 }
 
 char *
 }
 
 char *


@@ -627,7 +1116,7 @@ renamefrom(name)
        struct stat st;
 
        if (stat(name, &st) < 0) {
        struct stat st;
 
        if (stat(name, &st) < 0) {

-               reply(550, "%s: %s.", name, sys_errlist[errno]);
+               perror_reply(550, name);

                return ((char *)0);
        }
        reply(350, "File exists, ready for destination name");
                return ((char *)0);
        }
        reply(350, "File exists, ready for destination name");


@@ -637,80 +1126,328 @@ renamefrom(name)
 renamecmd(from, to)
        char *from, *to;
 {
 renamecmd(from, to)
        char *from, *to;
 {

+       if (rename(from, to) < 0)
+               perror_reply(550, "rename");
+       else
+               ack("RNTO");
+}

 
 

-       if (rename(from, to) < 0) {
-               reply(550, "rename: %s.", sys_errlist[errno]);
-               return;
+dolog(sin)
+       struct sockaddr_in *sin;
+{
+       struct hostent *hp = gethostbyaddr((char *)&sin->sin_addr,
+               sizeof (struct in_addr), AF_INET);
+       time_t t, time();
+       extern char *ctime();
+
+       if (hp)
+               (void) strncpy(remotehost, hp->h_name, sizeof (remotehost));
+       else
+               (void) strncpy(remotehost, inet_ntoa(sin->sin_addr),
+                   sizeof (remotehost));
+#ifdef SETPROCTITLE
+       sprintf(proctitle, "%s: connected", remotehost);
+       setproctitle(proctitle);
+#endif /* SETPROCTITLE */
+
+       if (logging) {
+               t = time((time_t *) 0);
+               syslog(LOG_INFO, "connection from %s at %s",
+                   remotehost, ctime(&t));

        }
        }

-       ack("RNTO");

 }
 
 }
 

-int guest;

 /*
 /*

- * Test pathname for guest-user safety.
+ * Record logout in wtmp file
+ * and exit with supplied status.

  */
  */

-inappropriate_request(name)
-       char *name;
+dologout(status)
+       int status;

 {
 {

-       int bogus = 0, depth = 0, length = strlen(name);
-       char *p, *s;
+       if (logged_in) {
+               (void) seteuid((uid_t)0);
+               logwtmp(ttyline, "", "");
+       }
+       /* beware of flushing buffers after a SIGPIPE */
+       _exit(status);
+}

 
 

-       if (!guest)
-               return (0);
-       if (name[0] == '/' || name[0] == '|')
-               bogus = 1;
-       for (p = name; p < name+length;) {
-               s = p;                          /* start of token */
-               while ( *p && *p!= '/')
-                       p++;
-               *p = 0;
-               if (strcmp(s, "..") == 0)
-                       depth -= 1;             /* backing up */
-               else if (strcmp(s, ".") == 0)
-                       depth += 0;             /* no change */
+myoob()
+{
+       char *cp;
+
+       /* only process if transfer occurring */
+       if (!transflag)
+               return;
+       cp = tmpline;
+       if (getline(cp, 7, stdin) == NULL) {
+               reply(221, "You could at least say goodbye.");
+               dologout(0);
+       }
+       upper(cp);
+       if (strcmp(cp, "ABOR\r\n") == 0) {
+               tmpline[0] = '\0';
+               reply(426, "Transfer aborted. Data connection closed.");
+               reply(226, "Abort successful");
+               longjmp(urgcatch, 1);
+       }
+       if (strcmp(cp, "STAT\r\n") == 0) {
+               if (file_size != (off_t) -1)
+                       reply(213, "Status: %lu of %lu bytes transferred",
+                           byte_count, file_size);

                else
                else

-                       depth += 1;             /* descending */
-               if (depth < 0) {
-                       bogus = 1;
-                       break;
-               }
+                       reply(213, "Status: %lu bytes transferred", byte_count);
+       }
+}
+
+/*
+ * Note: a response of 425 is not mentioned as a possible response to
+ *     the PASV command in RFC959. However, it has been blessed as
+ *     a legitimate response by Jon Postel in a telephone conversation
+ *     with Rick Adams on 25 Jan 89.
+ */
+passive()
+{
+       int len;
+       register char *p, *a;
+
+       pdata = socket(AF_INET, SOCK_STREAM, 0);
+       if (pdata < 0) {
+               perror_reply(425, "Can't open passive connection");
+               return;

        }
        }

-       if (bogus)
-               reply(553, "%s: pathname disallowed guest users", name);
-       return (bogus);
+       pasv_addr = ctrl_addr;
+       pasv_addr.sin_port = 0;
+       (void) seteuid((uid_t)0);
+       if (bind(pdata, (struct sockaddr *)&pasv_addr, sizeof(pasv_addr)) < 0) {
+               (void) seteuid((uid_t)pw->pw_uid);
+               goto pasv_error;
+       }
+       (void) seteuid((uid_t)pw->pw_uid);
+       len = sizeof(pasv_addr);
+       if (getsockname(pdata, (struct sockaddr *) &pasv_addr, &len) < 0)
+               goto pasv_error;
+       if (listen(pdata, 1) < 0)
+               goto pasv_error;
+       a = (char *) &pasv_addr.sin_addr;
+       p = (char *) &pasv_addr.sin_port;
+
+#define UC(b) (((int) b) & 0xff)
+
+       reply(227, "Entering Passive Mode (%d,%d,%d,%d,%d,%d)", UC(a[0]),
+               UC(a[1]), UC(a[2]), UC(a[3]), UC(p[0]), UC(p[1]));
+       return;
+
+pasv_error:
+       (void) close(pdata);
+       pdata = -1;
+       perror_reply(425, "Can't open passive connection");
+       return;

 }
 
 /*
 }
 
 /*

- * Convert network-format internet address
- * to base 256 d.d.d.d representation.
+ * Generate unique name for file with basename "local".
+ * The file named "local" is already known to exist.
+ * Generates failure reply on error.

  */
 char *
  */
 char *

-ntoa(in)
-       struct in_addr in;
+gunique(local)
+       char *local;

 {
 {

-       static char b[18];
-       register char *p;
+       static char new[MAXPATHLEN];
+       struct stat st;
+       char *cp = rindex(local, '/');
+       int count = 0;
+
+       if (cp)
+               *cp = '\0';
+       if (stat(cp ? local : ".", &st) < 0) {
+               perror_reply(553, cp ? local : ".");
+               return((char *) 0);
+       }
+       if (cp)
+               *cp = '/';
+       (void) strcpy(new, local);
+       cp = new + strlen(new);
+       *cp++ = '.';
+       for (count = 1; count < 100; count++) {
+               (void) sprintf(cp, "%d", count);
+               if (stat(new, &st) < 0)
+                       return(new);
+       }
+       reply(452, "Unique file name cannot be created.");
+       return((char *) 0);
+}

 
 

-       in.s_addr = ntohl(in.s_addr);
-       p = (char *)&in;
-#define        UC(b)   (((int)b)&0xff)
-       sprintf(b, "%d.%d.%d.%d", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3]));
-       return (b);
+/*
+ * Format and send reply containing system error number.
+ */
+perror_reply(code, string)
+       int code;
+       char *string;
+{
+       reply(code, "%s: %s.", string, strerror(errno));

 }
 
 }
 

-dolog(sin)
-       struct sockaddr_in *sin;
+static char *onefile[] = {
+       "",
+       0
+};
+
+send_file_list(whichfiles)
+       char *whichfiles;

 {
 {

-       struct hostent *hp = gethostbyaddr(&sin->sin_addr,
-               sizeof (struct in_addr), AF_INET);
-       char *remotehost;
-       time_t t;
+       struct stat st;
+       DIR *dirp = NULL;
+       struct direct *dir;
+       FILE *dout = NULL;
+       register char **dirlist, *dirname;
+       int simple = 0;
+       char *strpbrk();
+
+       if (strpbrk(whichfiles, "~{[*?") != NULL) {
+               extern char **glob(), *globerr;
+
+               globerr = NULL;
+               dirlist = glob(whichfiles);
+               if (globerr != NULL) {
+                       reply(550, globerr);
+                       return;
+               } else if (dirlist == NULL) {
+                       errno = ENOENT;
+                       perror_reply(550, whichfiles);
+                       return;
+               }
+       } else {
+               onefile[0] = whichfiles;
+               dirlist = onefile;
+               simple = 1;
+       }

 
 

-       if (hp)
-               remotehost = hp->h_name;
+       if (setjmp(urgcatch)) {
+               transflag = 0;
+               return;
+       }
+       while (dirname = *dirlist++) {
+               if (stat(dirname, &st) < 0) {
+                       /*
+                        * If user typed "ls -l", etc, and the client
+                        * used NLST, do what the user meant.
+                        */
+                       if (dirname[0] == '-' && *dirlist == NULL &&
+                           transflag == 0) {
+                               retrieve("/bin/ls %s", dirname);
+                               return;
+                       }
+                       perror_reply(550, whichfiles);
+                       if (dout != NULL) {
+                               (void) fclose(dout);
+                               transflag = 0;
+                               data = -1;
+                               pdata = -1;
+                       }
+                       return;
+               }
+
+               if ((st.st_mode&S_IFMT) == S_IFREG) {
+                       if (dout == NULL) {
+                               dout = dataconn("file list", (off_t)-1, "w");
+                               if (dout == NULL)
+                                       return;
+                               transflag++;
+                       }
+                       fprintf(dout, "%s%s\n", dirname,
+                               type == TYPE_A ? "\r" : "");
+                       byte_count += strlen(dirname) + 1;
+                       continue;
+               } else if ((st.st_mode&S_IFMT) != S_IFDIR)
+                       continue;
+
+               if ((dirp = opendir(dirname)) == NULL)
+                       continue;
+
+               while ((dir = readdir(dirp)) != NULL) {
+                       char nbuf[MAXPATHLEN];
+
+                       if (dir->d_name[0] == '.' && dir->d_namlen == 1)
+                               continue;
+                       if (dir->d_name[0] == '.' && dir->d_name[1] == '.' &&
+                           dir->d_namlen == 2)
+                               continue;
+
+                       sprintf(nbuf, "%s/%s", dirname, dir->d_name);
+
+                       /*
+                        * We have to do a stat to insure it's
+                        * not a directory or special file.
+                        */
+                       if (simple || (stat(nbuf, &st) == 0 &&
+                           (st.st_mode&S_IFMT) == S_IFREG)) {
+                               if (dout == NULL) {
+                                       dout = dataconn("file list", (off_t)-1,
+                                               "w");
+                                       if (dout == NULL)
+                                               return;
+                                       transflag++;
+                               }
+                               if (nbuf[0] == '.' && nbuf[1] == '/')
+                                       fprintf(dout, "%s%s\n", &nbuf[2],
+                                               type == TYPE_A ? "\r" : "");
+                               else
+                                       fprintf(dout, "%s%s\n", nbuf,
+                                               type == TYPE_A ? "\r" : "");
+                               byte_count += strlen(nbuf) + 1;
+                       }
+               }
+               (void) closedir(dirp);
+       }
+
+       if (dout == NULL)
+               reply(550, "No files found.");
+       else if (ferror(dout) != 0)
+               perror_reply(550, "Data connection");

        else
        else

-               remotehost = "UNKNOWNHOST";
-       t = time(0);
-       fprintf(stderr,"FTP: connection from %s at %s", remotehost, ctime(&t));
-       fflush(stderr);
+               reply(226, "Transfer complete.");
+
+       transflag = 0;
+       if (dout != NULL)
+               (void) fclose(dout);
+       data = -1;
+       pdata = -1;
+}
+
+#ifdef SETPROCTITLE
+/*
+ * clobber argv so ps will show what we're doing.
+ * (stolen from sendmail)
+ * warning, since this is usually started from inetd.conf, it
+ * often doesn't have much of an environment or arglist to overwrite.
+ */
+
+/*VARARGS1*/
+setproctitle(fmt, a, b, c)
+char *fmt;
+{
+       register char *p, *bp, ch;
+       register int i;
+       char buf[BUFSIZ];
+
+       (void) sprintf(buf, fmt, a, b, c);
+
+       /* make ps print our process name */
+       p = Argv[0];
+       *p++ = '-';
+
+       i = strlen(buf);
+       if (i > LastArgv - p - 2) {
+               i = LastArgv - p - 2;
+               buf[i] = '\0';
+       }
+       bp = buf;
+       while (ch = *bp++)
+               if (ch != '\n' && ch != '\r')
+                       *p++ = ch;
+       while (p < LastArgv)
+               *p++ = ' ';

 }
 }

+#endif /* SETPROCTITLE */