Tue Aug 11 04:30:59 1998 Matthew D Hancher <mdh@mit.edu>

	* ftpd.c: Add support for extended logging as per PR#481. Using
	the 'l' command line option twice now logs the major file commands,
	and using it thrice logs bytecounts for RETR and STOR as well.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10801 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 2a6874a37bd1f1d4ba283a89a6b3b64d78678225..5c6cc51588e9a11cd633b756d10c7586c350fcdc 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 11 04:30:59 1998  Matthew D Hancher  <mdh@mit.edu>
+
+       * ftpd.c: Add support for extended logging as per PR#481. Using 
+       the 'l' command line option twice now logs the major file commands, 
+       and using it thrice logs bytecounts for RETR and STOR as well.
+
 Fri Aug  7 00:56:30 1998  Matthew D Hancher  <mdh@mit.edu>
 
        * ftpcmd.y: Replace old KERBEROS #ifdef's with KRB5_KRB4_COMPAT

diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 58c63ec0153d215d8b6f4315ad30fe41780f8c89..f034b900e25443050c0208d018d0472f271a0702 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -193,6 +193,7 @@ off_t       byte_count;
 #endif
 int    defumask = CMASK;               /* default umask value */
 char   tmpline[FTP_BUFSIZ];
+char    pathbuf[MAXPATHLEN + 1];
 char   hostname[MAXHOSTNAMELEN];
 char   remotehost[MAXHOSTNAMELEN];
 
@@ -274,7 +275,7 @@ main(argc, argv, envp)
                        break;
 
                case 'l':
-                       logging = 1;
+                       logging ++;
                        break;
 
                case 'a':
@@ -537,6 +538,32 @@ sgetpwnam(name)
        return (&save);
 }
 
+/*
+ * Expand the given pathname relative to the current working directory.
+ */
+char *
+path_expand(path)
+       char *path;
+{
+       pathbuf[0] = '\x0';
+       if (!path) return pathbuf;
+       /* Don't bother with getcwd() if the path is absolute */
+       if (path[0] != '/') {
+               if (!getcwd(pathbuf, sizeof pathbuf)) {
+                       pathbuf[0] = '\x0';
+                       syslog(LOG_ERR, "getcwd() failed");
+               }
+               else {
+                       int len = strlen(pathbuf);
+                       if (pathbuf[len-1] != '/') {
+                               pathbuf[len++] = '/';
+                               pathbuf[len] = '\x0';
+                       }
+               }
+       }
+       return strcat(pathbuf, path);
+}
+
 setlevel(prot_level)
 int prot_level;
 {
@@ -911,6 +938,8 @@ retrieve(cmd, name)
        struct stat st;
        int (*closefunc)();
 
+       if (logging > 1 && !cmd)
+               syslog(LOG_NOTICE, "get %s", path_expand(name));
        if (cmd == 0) {
                fin = fopen(name, "r"), closefunc = fclose;
                st.st_size = 0;
@@ -966,6 +995,8 @@ retrieve(cmd, name)
        pdata = -1;
 done:
        (*closefunc)(fin);
+       if (logging > 2 && !cmd)
+               syslog(LOG_NOTICE, "get: %i bytes transferred", byte_count);
 }
 
 store_file(name, mode, unique)
@@ -977,6 +1008,8 @@ store_file(name, mode, unique)
        int (*closefunc)();
        char *gunique();
 
+       if (logging > 1) syslog(LOG_NOTICE, "put %s", path_expand(name));
+
        if (unique && stat(name, &st) == 0 &&
            (name = gunique(name)) == NULL)
                return;
@@ -1032,6 +1065,8 @@ store_file(name, mode, unique)
        pdata = -1;
 done:
        (*closefunc)(fout);
+       if (logging > 2)
+               syslog(LOG_NOTICE, "put: %i bytes transferred", byte_count);
 }
 
 FILE *
@@ -1605,6 +1640,8 @@ delete_file(name)
 {
        struct stat st;
 
+       if (logging > 1) syslog(LOG_NOTICE, "del %s", path_expand(name));
+
        if (stat(name, &st) < 0) {
                perror_reply(550, name);
                return;
@@ -1636,6 +1673,8 @@ cwd(path)
 makedir(name)
        char *name;
 {
+        if (logging > 1) syslog(LOG_NOTICE, "mkdir %s", path_expand(name));
+
        if (mkdir(name, 0777) < 0)
                perror_reply(550, name);
        else
@@ -1645,6 +1684,8 @@ makedir(name)
 removedir(name)
        char *name;
 {
+        if (logging > 1) syslog(LOG_NOTICE, "rmdir %s", path_expand(name));
+
        if (rmdir(name) < 0)
                perror_reply(550, name);
        else
@@ -1653,16 +1694,14 @@ removedir(name)
 
 pwd()
 {
-       char path[MAXPATHLEN + 1];
-
-       if (getcwd(path, sizeof path) == (char *)NULL)
+       if (getcwd(pathbuf, sizeof pathbuf) == (char *)NULL)
 #ifdef POSIX
-               perror_reply(550, path);
+               perror_reply(550, pathbuf);
 #else
-               reply(550, "%s.", path);
+               reply(550, "%s.", pathbuf);
 #endif
        else
-               reply(257, "\"%s\" is current directory.", path);
+               reply(257, "\"%s\" is current directory.", pathbuf);
 }
 
 char *
@@ -1682,6 +1721,9 @@ renamefrom(name)
 renamecmd(from, to)
        char *from, *to;
 {
+        if(logging > 1)
+                syslog(LOG_NOTICE, "rename %s %s", path_expand(from), to);
+
        if (rename(from, to) < 0)
                perror_reply(550, "rename");
        else