Subject: Patch for 2.4.2-BETA9

From: Jos Vos <[email-masked]>
Date: Tue, 20 Feb 1996 18:16:02 +0100

Hello,

I propose to include the following patch into the next release of WU-FPD.
The patch addresses the following problems:

-  The Linux config patch makes pid files be put in /var/run and log
   files in /var/log, as is required by the Linux filesystem standard,
   which is followed by the major Linux distributions today.

-  The pathnames patch makes the ftpusers file be put in the chosen 
   directory for config files.  It's a bit confusing to have this file
   in another directory than the other config files.

-  The xferlog.5 man page contains one large string (words concatenated
   with "\ \ \ "), which at least groff can't handle.  I propose to
   change these strings to "\ \  ", so that *roff gets a chance to
   break the line.

==========================CUT HERE=======================
--- src/config/config.lnx.orig	Tue Jan 23 07:09:31 1996
+++ src/config/config.lnx	Tue Feb 20 15:06:05 1996
@@ -26,8 +26,8 @@
 #define HAVE_SYMLINK
 #define UTMAXTYPE
 #define USE_ETC
+#define USE_LOG
 #define USE_VAR
-#define USE_PID
 #define VIRTUAL
 
 #include <bsd/bsd.h>
--- src/pathnames.h.orig	Tue Jan 23 07:09:14 1996
+++ src/pathnames.h	Mon Feb 19 18:08:21 1996
@@ -31,19 +31,21 @@
  * pathnames.h 5.2 (Berkeley) 6/1/90 
  */
 
-#define _PATH_FTPUSERS  "/etc/ftpusers"
 #define _PATH_EXECPATH  "/bin/ftp-exec"
 
 #ifdef USE_ETC
+#define _PATH_FTPUSERS  "/etc/ftpusers"
 #define _PATH_FTPACCESS "/etc/ftpaccess"
 #define _PATH_CVT       "/etc/ftpconversions"
 #define _PATH_PRIVATE   "/etc/ftpgroups"
 #else
 #ifdef USE_ETC_FTPD
+#define _PATH_FTPUSERS  "/etc/ftpd/ftpusers"
 #define _PATH_FTPACCESS "/etc/ftpd/ftpaccess"
 #define _PATH_CVT       "/etc/ftpd/ftpconversions"
 #define _PATH_PRIVATE   "/etc/ftpd/ftpgroups"
 #else
+#define _PATH_FTPUSERS  "/usr/local/etc/ftpusers"
 #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess"
 #define _PATH_CVT       "/usr/local/etc/ftpconversions"
 #define _PATH_PRIVATE   "/usr/local/etc/ftpgroups"
--- doc/xferlog.5.ORIGINAL	Tue Feb 20 14:53:24 1996
+++ doc/xferlog.5	Tue Feb 20 15:04:15 1996
@@ -14,7 +14,7 @@
 with all fields being separated by spaces.
 .IP
 .I
-current-time\ \ \ transfer-time\ \ \ remote-host\ \ \ file-size\ \ \ filename\ \ \ transfer-type\ \ \ special-action-flag\ \ \ direction\ \ \ access-mode\ \ \ username\ \ \ service-name\ \ \ authentication-method\ \ \ authenticated-user-id
+current-time\ \  transfer-time\ \  remote-host\ \  file-size\ \  filename\ \  transfer-type\ \  special-action-flag\ \  direction\ \  access-mode\ \  username\ \  service-name\ \  authentication-method\ \  authenticated-user-id
 .LP
 .TP 20
 .I current-time
==========================CUT HERE=======================

--
--    Jos Vos <[email-masked]>
--    X/OS Experts in Open Systems BV   |   Phone: +31 20 6938364
--    Amsterdam, The Netherlands        |     Fax: +31 20 6948204