BSD 4_4 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 409a50c..30c26ca 100644 (file)
--- a/usr/src/libexec/ftpd/ftpd.c
+++ b/usr/src/libexec/ftpd/ftpd.c
@@ -1,18 +1,44 @@
 /*
 /*

- * Copyright (c) 1985, 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1985, 1988, 1990, 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1985, 1988 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1985, 1988, 1990, 1992, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)ftpd.c     5.36    (Berkeley) %G%";
+static char sccsid[] = "@(#)ftpd.c     8.1 (Berkeley) 6/4/93";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -22,42 +48,44 @@ static char sccsid[] = "@(#)ftpd.c  5.36    (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/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>
 
 
 #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 <signal.h>

+#include <dirent.h>
+#include <fcntl.h>
+#include <time.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 <syslog.h>

-#include <varargs.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>

 #include "pathnames.h"
 #include "pathnames.h"

+#include "extern.h"

 
 

-/*
- * File containing login names
- * NOT to be used on this machine.
- * Commonly used to disallow uucp.
- */
-extern int errno;
-extern char *crypt();
-extern char version[];
+#if __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+extern off_t restart_point;

 extern char *home;             /* pointer to home directory for glob */
 extern char *home;             /* pointer to home directory for glob */

-extern FILE *ftpd_popen(), *fopen(), *freopen();
-extern int  ftpd_pclose(), fclose();
-extern char *getline();

 extern char cbuf[];
 extern char cbuf[];

+extern char version[];

 
 struct sockaddr_in ctrl_addr;
 struct sockaddr_in data_source;
 
 struct sockaddr_in ctrl_addr;
 struct sockaddr_in data_source;


@@ -103,24 +131,77 @@ char      remotehost[MAXHOSTNAMELEN];
 int    swaitmax = SWAITMAX;
 int    swaitint = SWAITINT;
 
 int    swaitmax = SWAITMAX;
 int    swaitint = SWAITINT;
 

-int    lostconn();
-int    myoob();
-FILE   *getdatasock(), *dataconn();
-

 #ifdef SETPROCTITLE
 char   **Argv = NULL;          /* pointer to argument vector */
 char   *LastArgv = NULL;       /* end of argv */
 char   proctitle[BUFSIZ];      /* initial part of title */
 #endif /* SETPROCTITLE */
 
 #ifdef SETPROCTITLE
 char   **Argv = NULL;          /* pointer to argument vector */
 char   *LastArgv = NULL;       /* end of argv */
 char   proctitle[BUFSIZ];      /* initial part of title */
 #endif /* SETPROCTITLE */
 

+#define MAXLINE         256
+
+#define LOGCMD(cmd, file) \
+       if (logging > 1) \
+           syslog(LOG_INFO,"%s %s%s", cmd, \
+               *(file) == '/' ? "" : curdir(), file);
+#define LOGCMD2(cmd, file1, file2) \
+        if (logging > 1) \
+           syslog(LOG_INFO,"%s %s%s %s%s", cmd, \
+               *(file1) == '/' ? "" : curdir(), file1, \
+               *(file2) == '/' ? "" : curdir(), file2);
+#define LOGBYTES(cmd, file, cnt) \
+       if (logging > 1) { \
+               if (cnt == (off_t)-1) \
+                   syslog(LOG_INFO,"%s %s%s", cmd, \
+                       *(file) == '/' ? "" : curdir(), file); \
+               else \
+                   syslog(LOG_INFO, "%s %s%s = %qd bytes", \
+                       cmd, (*(file) == '/') ? "" : curdir(), file, cnt); \
+       }
+
+static void     ack __P((char *));
+static void     myoob __P((int));
+static int      checkuser __P((char *));
+static FILE    *dataconn __P((char *, off_t, char *));
+static void     dolog __P((struct sockaddr_in *));
+static char    *curdir __P((void));
+static void     end_login __P((void));
+static FILE    *getdatasock __P((char *));
+static char    *gunique __P((char *));
+static void     lostconn __P((int));
+static int      receive_data __P((FILE *, FILE *));
+static void     send_data __P((FILE *, FILE *, off_t));
+static struct passwd *
+                sgetpwnam __P((char *));
+static char    *sgetsave __P((char *));
+
+static char *
+curdir()
+{
+       static char path[MAXPATHLEN+1+1];       /* path + '/' + '\0' */
+
+       if (getcwd(path, sizeof(path)-2) == NULL)
+               return ("");
+       if (path[1] != '\0')            /* special case for root dir. */
+               strcat(path, "/");
+       /* For guest account, skip / since it's chrooted */
+       return (guest ? path+1 : path);
+}
+
+int

 main(argc, argv, envp)
        int argc;
        char *argv[];
        char **envp;
 {
 main(argc, argv, envp)
        int argc;
        char *argv[];
        char **envp;
 {

-       int addrlen, on = 1;
-       char *cp;
+       int addrlen, on = 1, tos;
+       char *cp, line[MAXLINE];
+       FILE *fd;

 
 

+       /*
+        * LOG_NDELAY sets up the logging connection immediately,
+        * necessary for anonymous ftp's that chroot and can't do it later.
+        */
+       openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP);

        addrlen = sizeof (his_addr);
        if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
                syslog(LOG_ERR, "getpeername (%s): %m",argv[0]);
        addrlen = sizeof (his_addr);
        if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
                syslog(LOG_ERR, "getpeername (%s): %m",argv[0]);


@@ -131,9 +212,13 @@ main(argc, argv, envp)
                syslog(LOG_ERR, "getsockname (%s): %m",argv[0]);
                exit(1);
        }
                syslog(LOG_ERR, "getsockname (%s): %m",argv[0]);
                exit(1);
        }

+#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;
        data_source.sin_port = htons(ntohs(ctrl_addr.sin_port) - 1);
        debug = 0;

-       openlog("ftpd", LOG_PID, LOG_DAEMON);

 #ifdef SETPROCTITLE
        /*
         *  Save start and extent of argv for setproctitle.
 #ifdef SETPROCTITLE
        /*
         *  Save start and extent of argv for setproctitle.


@@ -157,7 +242,7 @@ main(argc, argv, envp)
                        break;
 
                case 'l':
                        break;
 
                case 'l':

-                       logging = 1;
+                       logging++;      /* > 1 == extra logging */

                        break;
 
                case 't':
                        break;
 
                case 't':


@@ -219,6 +304,29 @@ nextopt:
        stru = STRU_F;
        mode = MODE_S;
        tmpline[0] = '\0';
        stru = STRU_F;
        mode = MODE_S;
        tmpline[0] = '\0';

+
+       /* If logins are disabled, print out the message. */
+       if ((fd = fopen(_PATH_NOLOGIN,"r")) != NULL) {
+               while (fgets(line, sizeof (line), fd) != NULL) {
+                       if ((cp = strchr(line, '\n')) != NULL)
+                               *cp = '\0';
+                       lreply(530, "%s", line);
+               }
+               (void) fflush(stdout);
+               (void) fclose(fd);
+               reply(530, "System not available.");
+               exit(0);
+       }
+       if ((fd = fopen(_PATH_FTPWELCOME, "r")) != NULL) {
+               while (fgets(line, sizeof (line), fd) != NULL) {
+                       if ((cp = strchr(line, '\n')) != NULL)
+                               *cp = '\0';
+                       lreply(220, "%s", line);
+               }
+               (void) fflush(stdout);
+               (void) fclose(fd);
+               /* reply(220,) must follow */
+       }

        (void) gethostname(hostname, sizeof (hostname));
        reply(220, "%s FTP server (%s) ready.", hostname, version);
        (void) setjmp(errcatch);
        (void) gethostname(hostname, sizeof (hostname));
        reply(220, "%s FTP server (%s) ready.", hostname, version);
        (void) setjmp(errcatch);


@@ -227,9 +335,10 @@ nextopt:
        /* NOTREACHED */
 }
 
        /* NOTREACHED */
 }
 

-lostconn()
+static void
+lostconn(signo)
+       int signo;

 {
 {

-

        if (debug)
                syslog(LOG_DEBUG, "lost connection");
        dologout(-1);
        if (debug)
                syslog(LOG_DEBUG, "lost connection");
        dologout(-1);


@@ -240,11 +349,10 @@ static char ttyline[20];
 /*
  * Helper function for sgetpwnam().
  */
 /*
  * Helper function for sgetpwnam().
  */

-char *
+static char *

 sgetsave(s)
        char *s;
 {
 sgetsave(s)
        char *s;
 {

-       char *malloc();

        char *new = malloc((unsigned) strlen(s) + 1);
 
        if (new == NULL) {
        char *new = malloc((unsigned) strlen(s) + 1);
 
        if (new == NULL) {


@@ -261,7 +369,7 @@ sgetsave(s)
  * the data returned must not be clobbered by any other command
  * (e.g., globbing).
  */
  * the data returned must not be clobbered by any other command
  * (e.g., globbing).
  */

-struct passwd *
+static struct passwd *

 sgetpwnam(name)
        char *name;
 {
 sgetpwnam(name)
        char *name;
 {


@@ -287,8 +395,9 @@ sgetpwnam(name)
        return (&save);
 }
 
        return (&save);
 }
 

-int login_attempts;            /* number of failed login attempts */
-int askpasswd;                 /* had user command, ask for passwd */
+static int login_attempts;     /* number of failed login attempts */
+static int askpasswd;          /* had user command, ask for passwd */
+static char curname[10];       /* current USER name */

 
 /*
  * USER command.
 
 /*
  * USER command.


@@ -301,12 +410,12 @@ int askpasswd;                    /* had user command, ask for passwd */
  * shell as returned by getusershell().  Disallow anyone mentioned in the file
  * _PATH_FTPUSERS to allow people such as root and uucp to be avoided.
  */
  * shell as returned by getusershell().  Disallow anyone mentioned in the file
  * _PATH_FTPUSERS to allow people such as root and uucp to be avoided.
  */

+void

 user(name)
        char *name;
 {
        register char *cp;
        char *shell;
 user(name)
        char *name;
 {
        register char *cp;
        char *shell;

-       char *getusershell();

 
        if (logged_in) {
                if (guest) {
 
        if (logged_in) {
                if (guest) {


@@ -323,9 +432,13 @@ user(name)
                else if ((pw = sgetpwnam("ftp")) != NULL) {
                        guest = 1;
                        askpasswd = 1;
                else if ((pw = sgetpwnam("ftp")) != NULL) {
                        guest = 1;
                        askpasswd = 1;

-                       reply(331, "Guest login ok, send ident as password.");
+                       reply(331,
+                           "Guest login ok, type your name as password.");

                } else
                        reply(530, "User %s unknown.", name);
                } else
                        reply(530, "User %s unknown.", name);

+               if (!askpasswd && logging)
+                       syslog(LOG_NOTICE,
+                           "ANONYMOUS FTP LOGIN REFUSED FROM %s", remotehost);

                return;
        }
        if (pw = sgetpwnam(name)) {
                return;
        }
        if (pw = sgetpwnam(name)) {


@@ -335,6 +448,7 @@ user(name)
                        if (strcmp(cp, shell) == 0)
                                break;
                endusershell();
                        if (strcmp(cp, shell) == 0)
                                break;
                endusershell();

+

                if (cp == NULL || checkuser(name)) {
                        reply(530, "User %s access denied.", name);
                        if (logging)
                if (cp == NULL || checkuser(name)) {
                        reply(530, "User %s access denied.", name);
                        if (logging)


@@ -345,6 +459,8 @@ user(name)
                        return;
                }
        }
                        return;
                }
        }

+       if (logging)
+               strncpy(curname, name, sizeof(curname)-1);

        reply(331, "Password required for %s.", name);
        askpasswd = 1;
        /*
        reply(331, "Password required for %s.", name);
        askpasswd = 1;
        /*


@@ -358,31 +474,36 @@ user(name)
 /*
  * Check if a user is in the file _PATH_FTPUSERS
  */
 /*
  * Check if a user is in the file _PATH_FTPUSERS
  */

+static int

 checkuser(name)
        char *name;
 {
        register FILE *fd;
        register char *p;
        char line[BUFSIZ];
 checkuser(name)
        char *name;
 {
        register FILE *fd;
        register char *p;
        char line[BUFSIZ];

+       int found = 0;

 
        if ((fd = fopen(_PATH_FTPUSERS, "r")) != NULL) {
                while (fgets(line, sizeof(line), fd) != NULL)
 
        if ((fd = fopen(_PATH_FTPUSERS, "r")) != NULL) {
                while (fgets(line, sizeof(line), fd) != NULL)

-                       if ((p = index(line, '\n')) != NULL) {
+                       if ((p = strchr(line, '\n')) != NULL) {

                                *p = '\0';
                                if (line[0] == '#')
                                        continue;
                                *p = '\0';
                                if (line[0] == '#')
                                        continue;

-                               if (strcmp(line, name) == 0)
-                                       return (1);
+                               if (strcmp(p, name) == 0) {
+                                       found = 1;
+                                       break;
+                               }

                        }
                (void) fclose(fd);
        }
                        }
                (void) fclose(fd);
        }

-       return (0);
+       return (found);

 }
 
 /*
  * Terminate login as previous user, if any, resetting state;
  * used when USER command is given or login fails.
  */
 }
 
 /*
  * Terminate login as previous user, if any, resetting state;
  * used when USER command is given or login fails.
  */

+static void

 end_login()
 {
 
 end_login()
 {
 


@@ -394,10 +515,12 @@ end_login()
        guest = 0;
 }
 
        guest = 0;
 }
 

+void

 pass(passwd)
        char *passwd;
 {
        char *xpasswd, *salt;
 pass(passwd)
        char *passwd;
 {
        char *xpasswd, *salt;

+       FILE *fd;

 
        if (logged_in || askpasswd == 0) {
                reply(503, "Login with USER first.");
 
        if (logged_in || askpasswd == 0) {
                reply(503, "Login with USER first.");


@@ -414,6 +537,10 @@ pass(passwd)
                if (pw == NULL || *pw->pw_passwd == '\0' ||
                    strcmp(xpasswd, pw->pw_passwd)) {
                        reply(530, "Login incorrect.");
                if (pw == NULL || *pw->pw_passwd == '\0' ||
                    strcmp(xpasswd, pw->pw_passwd)) {
                        reply(530, "Login incorrect.");

+                       if (logging)
+                               syslog(LOG_NOTICE,
+                                   "FTP LOGIN FAILED FROM %s, %s",
+                                   remotehost, curname);

                        pw = NULL;
                        if (login_attempts++ >= 5) {
                                syslog(LOG_NOTICE,
                        pw = NULL;
                        if (login_attempts++ >= 5) {
                                syslog(LOG_NOTICE,


@@ -425,7 +552,10 @@ pass(passwd)
                }
        }
        login_attempts = 0;             /* this time successful */
                }
        }
        login_attempts = 0;             /* this time successful */

-       (void) setegid((gid_t)pw->pw_gid);
+       if (setegid((gid_t)pw->pw_gid) < 0) {
+               reply(550, "Can't set gid.");
+               return;
+       }

        (void) initgroups(pw->pw_name, pw->pw_gid);
 
        /* open wtmp before chroot */
        (void) initgroups(pw->pw_name, pw->pw_gid);
 
        /* open wtmp before chroot */


@@ -455,6 +585,21 @@ pass(passwd)
                reply(550, "Can't set uid.");
                goto bad;
        }
                reply(550, "Can't set uid.");
                goto bad;
        }

+       /*
+        * Display a login message, if it exists.
+        * N.B. reply(230,) must follow the message.
+        */
+       if ((fd = fopen(_PATH_FTPLOGINMESG, "r")) != NULL) {
+               char *cp, line[MAXLINE];
+
+               while (fgets(line, sizeof (line), fd) != NULL) {
+                       if ((cp = strchr(line, '\n')) != NULL)
+                               *cp = '\0';
+                       lreply(230, "%s", line);
+               }
+               (void) fflush(stdout);
+               (void) fclose(fd);
+       }

        if (guest) {
                reply(230, "Guest login ok, access restrictions apply.");
 #ifdef SETPROCTITLE
        if (guest) {
                reply(230, "Guest login ok, access restrictions apply.");
 #ifdef SETPROCTITLE


@@ -466,6 +611,7 @@ pass(passwd)
                if (logging)
                        syslog(LOG_INFO, "ANONYMOUS FTP LOGIN FROM %s, %s",
                            remotehost, passwd);
                if (logging)
                        syslog(LOG_INFO, "ANONYMOUS FTP LOGIN FROM %s, %s",
                            remotehost, passwd);

+               home = "/";             /* guest home dir for globbing */

        } else {
                reply(230, "User %s logged in.", pw->pw_name);
 #ifdef SETPROCTITLE
        } else {
                reply(230, "User %s logged in.", pw->pw_name);
 #ifdef SETPROCTITLE


@@ -473,10 +619,10 @@ pass(passwd)
                setproctitle(proctitle);
 #endif /* SETPROCTITLE */
                if (logging)
                setproctitle(proctitle);
 #endif /* SETPROCTITLE */
                if (logging)

-                       syslog(LOG_INFO, "FTP LOGIN FROM %s, %s",
+                       syslog(LOG_INFO, "FTP LOGIN FROM %s as %s",

                            remotehost, pw->pw_name);
                            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:
        (void) umask(defumask);
        return;
 bad:


@@ -484,6 +630,7 @@ bad:
        end_login();
 }
 
        end_login();
 }
 

+void

 retrieve(cmd, name)
        char *cmd, *name;
 {
 retrieve(cmd, name)
        char *cmd, *name;
 {


@@ -503,15 +650,39 @@ retrieve(cmd, name)
                st.st_blksize = BUFSIZ;
        }
        if (fin == NULL) {
                st.st_blksize = BUFSIZ;
        }
        if (fin == NULL) {

-               if (errno != 0)
+               if (errno != 0) {

                        perror_reply(550, name);
                        perror_reply(550, name);

+                       if (cmd == 0) {
+                               LOGCMD("get", name);
+                       }
+               }

                return;
        }
                return;
        }

+       byte_count = -1;

        if (cmd == 0 &&
            (fstat(fileno(fin), &st) < 0 || (st.st_mode&S_IFMT) != S_IFREG)) {
                reply(550, "%s: not a plain file.", name);
                goto done;
        }
        if (cmd == 0 &&
            (fstat(fileno(fin), &st) < 0 || (st.st_mode&S_IFMT) != S_IFREG)) {
                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;


@@ -520,9 +691,12 @@ retrieve(cmd, name)
        data = -1;
        pdata = -1;
 done:
        data = -1;
        pdata = -1;
 done:

+       if (cmd == 0)
+               LOGBYTES("get", name, byte_count);

        (*closefunc)(fin);
 }
 
        (*closefunc)(fin);
 }
 

+void

 store(name, mode, unique)
        char *name, *mode;
        int unique;
 store(name, mode, unique)
        char *name, *mode;
        int unique;


@@ -530,18 +704,51 @@ store(name, mode, unique)
        FILE *fout, *din;
        struct stat st;
        int (*closefunc)();
        FILE *fout, *din;
        struct stat st;
        int (*closefunc)();

-       char *gunique();

 
        if (unique && stat(name, &st) == 0 &&
 
        if (unique && stat(name, &st) == 0 &&

-           (name = gunique(name)) == NULL)
+           (name = gunique(name)) == NULL) {
+               LOGCMD(*mode == 'w' ? "put" : "append", name);

                return;
                return;

+       }

 
 

+       if (restart_point)
+               mode = "r+w";

        fout = fopen(name, mode);
        closefunc = fclose;
        if (fout == NULL) {
                perror_reply(553, name);
        fout = fopen(name, mode);
        closefunc = fclose;
        if (fout == NULL) {
                perror_reply(553, name);

+               LOGCMD(*mode == 'w' ? "put" : "append", name);

                return;
        }
                return;
        }

+       byte_count = -1;
+       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;
        din = dataconn(name, (off_t)-1, "r");
        if (din == NULL)
                goto done;


@@ -556,21 +763,23 @@ store(name, mode, unique)
        data = -1;
        pdata = -1;
 done:
        data = -1;
        pdata = -1;
 done:

+       LOGBYTES(*mode == 'w' ? "put" : "append", name, byte_count);

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

-FILE *
+static FILE *

 getdatasock(mode)
        char *mode;
 {
        int s, on = 1, tries;
 getdatasock(mode)
        char *mode;
 {
        int s, on = 1, tries;

+       int t;

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

+       (void) seteuid((uid_t)0);

        s = socket(AF_INET, SOCK_STREAM, 0);
        if (s < 0)
        s = socket(AF_INET, SOCK_STREAM, 0);
        if (s < 0)

-               return (NULL);
-       (void) seteuid((uid_t)0);
+               goto bad;

        if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
            (char *) &on, sizeof (on)) < 0)
                goto bad;
        if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
            (char *) &on, sizeof (on)) < 0)
                goto bad;


@@ -586,14 +795,22 @@ getdatasock(mode)
                sleep(tries);
        }
        (void) seteuid((uid_t)pw->pw_uid);
                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:

+       /* Return the real value of errno (close may change it) */
+       t = errno;

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

+       errno = t;

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

-FILE *
+static FILE *

 dataconn(name, size, mode)
        char *name;
        off_t size;
 dataconn(name, size, mode)
        char *name;
        off_t size;


@@ -601,12 +818,12 @@ dataconn(name, size, mode)
 {
        char sizebuf[32];
        FILE *file;
 {
        char sizebuf[32];
        FILE *file;

-       int retry = 0;
+       int retry = 0, tos;

 
        file_size = size;
        byte_count = 0;
        if (size != (off_t) -1)
 
        file_size = size;
        byte_count = 0;
        if (size != (off_t) -1)

-               (void) sprintf (sizebuf, " (%ld bytes)", size);
+               (void) sprintf (sizebuf, " (%qd bytes)", size);

        else
                (void) strcpy(sizebuf, "");
        if (pdata >= 0) {
        else
                (void) strcpy(sizebuf, "");
        if (pdata >= 0) {


@@ -622,12 +839,17 @@ dataconn(name, size, mode)
                }
                (void) close(pdata);
                pdata = s;
                }
                (void) close(pdata);
                pdata = s;

-               reply(150, "Opening %s mode data connection for %s%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) {
                     type == TYPE_A ? "ASCII" : "BINARY", name, sizebuf);
                return(fdopen(pdata, mode));
        }
        if (data >= 0) {

-               reply(125, "Using existing data connection for %s%s.",
+               reply(125, "Using existing data connection for '%s'%s.",

                    name, sizebuf);
                usedefault = 1;
                return (fdopen(data, mode));
                    name, sizebuf);
                usedefault = 1;
                return (fdopen(data, mode));


@@ -655,19 +877,18 @@ dataconn(name, size, mode)
                data = -1;
                return (NULL);
        }
                data = -1;
                return (NULL);
        }

-       reply(150, "Opening %s mode data connection for %s%s.",
+       reply(150, "Opening %s mode data connection for '%s'%s.",

             type == TYPE_A ? "ASCII" : "BINARY", name, sizebuf);
        return (file);
 }
 
 /*
             type == TYPE_A ? "ASCII" : "BINARY", name, sizebuf);
        return (file);
 }
 
 /*

- * Tranfer the contents of "instr" to
- * "outstr" peer using the appropriate
- * encapsulation of the data subject
- * to Mode, Structure, and Type.
+ * Tranfer the contents of "instr" to "outstr" peer using the appropriate
+ * encapsulation of the data subject * to Mode, Structure, and Type.

  *
  * NB: Form isn't handled.
  */
  *
  * NB: Form isn't handled.
  */

+static void

 send_data(instr, outstr, blksize)
        FILE *instr, *outstr;
        off_t blksize;
 send_data(instr, outstr, blksize)
        FILE *instr, *outstr;
        off_t blksize;


@@ -740,13 +961,12 @@ file_err:
 }
 
 /*
 }
 
 /*

- * Transfer data from peer to
- * "outstr" using the appropriate
- * encapulation of the data subject
- * to Mode, Structure, and Type.
+ * Transfer data from peer to "outstr" using the appropriate encapulation of
+ * the data subject to Mode, Structure, and Type.

  *
  * N.B.: Form isn't handled.
  */
  *
  * N.B.: Form isn't handled.
  */

+static int

 receive_data(instr, outstr)
        FILE *instr, *outstr;
 {
 receive_data(instr, outstr)
        FILE *instr, *outstr;
 {


@@ -823,6 +1043,7 @@ file_err:
        return (-1);
 }
 
        return (-1);
 }
 

+void

 statfilecmd(filename)
        char *filename;
 {
 statfilecmd(filename)
        char *filename;
 {


@@ -830,7 +1051,7 @@ statfilecmd(filename)
        FILE *fin;
        int c;
 
        FILE *fin;
        int c;
 

-       (void) sprintf(line, "/bin/ls -lgA %s", filename);
+       (void)snprintf(line, sizeof(line), "/bin/ls -lgA %s", filename);

        fin = ftpd_popen(line, "r");
        lreply(211, "status of %s:", filename);
        while ((c = getc(fin)) != EOF) {
        fin = ftpd_popen(line, "r");
        lreply(211, "status of %s:", filename);
        while ((c = getc(fin)) != EOF) {


@@ -854,6 +1075,7 @@ statfilecmd(filename)
        reply(211, "End of Status");
 }
 
        reply(211, "End of Status");
 }
 

+void

 statcmd()
 {
        struct sockaddr_in *sin;
 statcmd()
 {
        struct sockaddr_in *sin;


@@ -906,6 +1128,7 @@ printaddr:
        reply(211, "End of status");
 }
 
        reply(211, "End of status");
 }
 

+void

 fatal(s)
        char *s;
 {
 fatal(s)
        char *s;
 {


@@ -915,42 +1138,66 @@ fatal(s)
        /* NOTREACHED */
 }
 
        /* NOTREACHED */
 }
 

-/* VARARGS2 */
-reply(n, fmt, p0, p1, p2, p3, p4, p5)
+void
+#if __STDC__
+reply(int n, const char *fmt, ...)
+#else
+reply(n, fmt, va_alist)

        int n;
        char *fmt;
        int n;
        char *fmt;

+        va_dcl
+#endif

 {
 {

-       printf("%d ", n);
-       printf(fmt, p0, p1, p2, p3, p4, p5);
-       printf("\r\n");
+       va_list ap;
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       (void)printf("%d ", n);
+       (void)vprintf(fmt, ap);
+       (void)printf("\r\n");

        (void)fflush(stdout);
        if (debug) {
                syslog(LOG_DEBUG, "<--- %d ", n);
        (void)fflush(stdout);
        if (debug) {
                syslog(LOG_DEBUG, "<--- %d ", n);

-               syslog(LOG_DEBUG, fmt, p0, p1, p2, p3, p4, p5);
-}
+               vsyslog(LOG_DEBUG, fmt, ap);
+       }

 }
 
 }
 

-/* VARARGS2 */
-lreply(n, fmt, p0, p1, p2, p3, p4, p5)
+void
+#if __STDC__
+lreply(int n, const char *fmt, ...)
+#else
+lreply(n, fmt, va_alist)

        int n;
        char *fmt;
        int n;
        char *fmt;

+        va_dcl
+#endif

 {
 {

-       printf("%d- ", n);
-       printf(fmt, p0, p1, p2, p3, p4, p5);
-       printf("\r\n");
+       va_list ap;
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       (void)printf("%d- ", n);
+       (void)vprintf(fmt, ap);
+       (void)printf("\r\n");

        (void)fflush(stdout);
        if (debug) {
                syslog(LOG_DEBUG, "<--- %d- ", n);
        (void)fflush(stdout);
        if (debug) {
                syslog(LOG_DEBUG, "<--- %d- ", n);

-               syslog(LOG_DEBUG, fmt, p0, p1, p2, p3, p4, p5);
+               vsyslog(LOG_DEBUG, fmt, ap);

        }
 }
 
        }
 }
 

+static void

 ack(s)
        char *s;
 {
        reply(250, "%s command successful.", s);
 }
 
 ack(s)
        char *s;
 {
        reply(250, "%s command successful.", s);
 }
 

+void

 nack(s)
        char *s;
 {
 nack(s)
        char *s;
 {


@@ -958,21 +1205,24 @@ nack(s)
 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */

+char *

 yyerror(s)
        char *s;
 {
        char *cp;
 
 yyerror(s)
        char *s;
 {
        char *cp;
 

-       if (cp = index(cbuf,'\n'))
+       if (cp = strchr(cbuf,'\n'))

                *cp = '\0';
        reply(500, "'%s': command not understood.", cbuf);
 }
 
                *cp = '\0';
        reply(500, "'%s': command not understood.", cbuf);
 }
 

+void

 delete(name)
        char *name;
 {
        struct stat st;
 
 delete(name)
        char *name;
 {
        struct stat st;
 

+       LOGCMD("delete", name);

        if (stat(name, &st) < 0) {
                perror_reply(550, name);
                return;
        if (stat(name, &st) < 0) {
                perror_reply(550, name);
                return;


@@ -992,6 +1242,7 @@ done:
        ack("DELE");
 }
 
        ack("DELE");
 }
 

+void

 cwd(path)
        char *path;
 {
 cwd(path)
        char *path;
 {


@@ -1001,28 +1252,32 @@ cwd(path)
                ack("CWD");
 }
 
                ack("CWD");
 }
 

+void

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

+       LOGCMD("mkdir", name);

        if (mkdir(name, 0777) < 0)
                perror_reply(550, name);
        else
                reply(257, "MKD command successful.");
 }
 
        if (mkdir(name, 0777) < 0)
                perror_reply(550, name);
        else
                reply(257, "MKD command successful.");
 }
 

+void

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

+       LOGCMD("rmdir", name);

        if (rmdir(name) < 0)
                perror_reply(550, name);
        else
                ack("RMD");
 }
 
        if (rmdir(name) < 0)
                perror_reply(550, name);
        else
                ack("RMD");
 }
 

+void

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

-       extern char *getwd();

 
        if (getwd(path) == (char *)NULL)
                reply(550, "%s.", path);
 
        if (getwd(path) == (char *)NULL)
                reply(550, "%s.", path);


@@ -1044,22 +1299,23 @@ renamefrom(name)
        return (name);
 }
 
        return (name);
 }
 

+void

 renamecmd(from, to)
        char *from, *to;
 {
 renamecmd(from, to)
        char *from, *to;
 {

+       LOGCMD2("rename", from, to);

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

+static void

 dolog(sin)
        struct sockaddr_in *sin;
 {
        struct hostent *hp = gethostbyaddr((char *)&sin->sin_addr,
                sizeof (struct in_addr), AF_INET);
 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));
 
        if (hp)
                (void) strncpy(remotehost, hp->h_name, sizeof (remotehost));


@@ -1071,17 +1327,15 @@ dolog(sin)
        setproctitle(proctitle);
 #endif /* SETPROCTITLE */
 
        setproctitle(proctitle);
 #endif /* SETPROCTITLE */
 

-       if (logging) {
-               t = time((time_t *) 0);
-               syslog(LOG_INFO, "connection from %s at %s",
-                   remotehost, ctime(&t));
-       }
+       if (logging)
+               syslog(LOG_INFO, "connection from %s", remotehost);

 }
 
 /*
  * Record logout in wtmp file
  * and exit with supplied status.
  */
 }
 
 /*
  * Record logout in wtmp file
  * and exit with supplied status.
  */

+void

 dologout(status)
        int status;
 {
 dologout(status)
        int status;
 {


@@ -1093,7 +1347,9 @@ dologout(status)
        _exit(status);
 }
 
        _exit(status);
 }
 

-myoob()
+static void
+myoob(signo)
+       int signo;

 {
        char *cp;
 
 {
        char *cp;
 


@@ -1114,19 +1370,20 @@ myoob()
        }
        if (strcmp(cp, "STAT\r\n") == 0) {
                if (file_size != (off_t) -1)
        }
        if (strcmp(cp, "STAT\r\n") == 0) {
                if (file_size != (off_t) -1)

-                       reply(213, "Status: %lu of %lu bytes transferred",
+                       reply(213, "Status: %qd of %qd bytes transferred",

                            byte_count, file_size);
                else
                            byte_count, file_size);
                else

-                       reply(213, "Status: %lu bytes transferred", byte_count);
+                       reply(213, "Status: %qd bytes transferred", byte_count);

        }
 }
 
 /*
  * Note: a response of 425 is not mentioned as a possible response to
        }
 }
 
 /*
  * 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
+ *     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.
  */
  *     with Rick Adams on 25 Jan 89.
  */

+void

 passive()
 {
        int len;
 passive()
 {
        int len;


@@ -1171,15 +1428,16 @@ pasv_error:
  * The file named "local" is already known to exist.
  * Generates failure reply on error.
  */
  * The file named "local" is already known to exist.
  * Generates failure reply on error.
  */

-char *
+static char *

 gunique(local)
        char *local;
 {
        static char new[MAXPATHLEN];
        struct stat st;
 gunique(local)
        char *local;
 {
        static char new[MAXPATHLEN];
        struct stat st;

-       char *cp = rindex(local, '/');
-       int count = 0;
+       int count;
+       char *cp;

 
 

+       cp = strrchr(local, '/');

        if (cp)
                *cp = '\0';
        if (stat(cp ? local : ".", &st) < 0) {
        if (cp)
                *cp = '\0';
        if (stat(cp ? local : ".", &st) < 0) {


@@ -1192,17 +1450,18 @@ gunique(local)
        cp = new + strlen(new);
        *cp++ = '.';
        for (count = 1; count < 100; count++) {
        cp = new + strlen(new);
        *cp++ = '.';
        for (count = 1; count < 100; count++) {

-               (void) sprintf(cp, "%d", count);
+               (void)sprintf(cp, "%d", count);

                if (stat(new, &st) < 0)
                        return(new);
        }
        reply(452, "Unique file name cannot be created.");
                if (stat(new, &st) < 0)
                        return(new);
        }
        reply(452, "Unique file name cannot be created.");

-       return((char *) 0);
+       return(NULL);

 }
 
 /*
  * Format and send reply containing system error number.
  */
 }
 
 /*
  * Format and send reply containing system error number.
  */

+void

 perror_reply(code, string)
        int code;
        char *string;
 perror_reply(code, string)
        int code;
        char *string;


@@ -1215,22 +1474,22 @@ static char *onefile[] = {
        0
 };
 
        0
 };
 

+void

 send_file_list(whichfiles)
        char *whichfiles;
 {
        struct stat st;
        DIR *dirp = NULL;
 send_file_list(whichfiles)
        char *whichfiles;
 {
        struct stat st;
        DIR *dirp = NULL;

-       struct direct *dir;
+       struct dirent *dir;

        FILE *dout = NULL;
        register char **dirlist, *dirname;
        int simple = 0;
        FILE *dout = NULL;
        register char **dirlist, *dirname;
        int simple = 0;

-       char *strpbrk();

 
        if (strpbrk(whichfiles, "~{[*?") != NULL) {
 
        if (strpbrk(whichfiles, "~{[*?") != NULL) {

-               extern char **glob(), *globerr;
+               extern char *globerr;

 
                globerr = NULL;
 
                globerr = NULL;

-               dirlist = glob(whichfiles);
+               dirlist = ftpglob(whichfiles);

                if (globerr != NULL) {
                        reply(550, globerr);
                        return;
                if (globerr != NULL) {
                        reply(550, globerr);
                        return;


@@ -1339,21 +1598,29 @@ send_file_list(whichfiles)
 
 #ifdef SETPROCTITLE
 /*
 
 #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.
+ * 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;
+void
+#if __STDC__
+setproctitle(const char *fmt, ...)
+#else
+setproctitle(fmt, va_alist)
+       char *fmt;
+        va_dcl
+#endif

 {
        register char *p, *bp, ch;
        register int i;
 {
        register char *p, *bp, ch;
        register int i;

+       va_list ap;

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

-
-       (void) sprintf(buf, fmt, a, b, c);
+#if __STDC__
+       va_start(ap, fmt);
+#else
+       va_start(ap);
+#endif
+       (void)vsnprintf(buf, sizeof(buf), fmt, ap);

 
        /* make ps print our process name */
        p = Argv[0];
 
        /* make ps print our process name */
        p = Argv[0];