diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1995-08-08 11:06:34 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1995-08-08 11:06:34 +0000 |
| commit | abb799add164d4fa1b97d1eb3dcac871785ef9f6 (patch) | |
| tree | fbd3e638472735acc3269fa831c037611e15caa3 /ftp/wu-ftpd+ipv6/files/patch-ac | |
| parent | Added dmake and noweb, convert to new format along the way. (diff) | |
Correct a few pathname problems. In particular, put ftpd in libexec,
not etc.
Submitted by: Tom Samplonius <tom@misery.sdf.com>
Notes
Notes:
svn path=/head/; revision=2040
Diffstat (limited to 'ftp/wu-ftpd+ipv6/files/patch-ac')
| -rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-ac | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ac b/ftp/wu-ftpd+ipv6/files/patch-ac index 8f9f98a46283..971dbb40f3e6 100644 --- a/ftp/wu-ftpd+ipv6/files/patch-ac +++ b/ftp/wu-ftpd+ipv6/files/patch-ac @@ -1,47 +1,50 @@ -*** src/pathnames.h.orig Wed Apr 13 22:46:48 1994 ---- src/pathnames.h Tue Oct 18 18:26:26 1994 +*** src/pathnames.h.orig Wed Apr 13 13:46:48 1994 +--- src/pathnames.h Sun Aug 6 21:45:38 1995 *************** -*** 29,41 **** +*** 29,46 **** * * @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */ ! #define _PATH_FTPUSERS "/etc/ftpusers" -! #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess" + #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess" #define _PATH_EXECPATH "/bin/ftp-exec" ! #define _PATH_PIDNAMES "/usr/local/daemon/ftpd/ftp.pids-%s" -! #define _PATH_CVT "/usr/local/etc/ftpconversions" + #define _PATH_CVT "/usr/local/etc/ftpconversions" ! #define _PATH_XFERLOG "/usr/adm/xferlog" ! #define _PATH_PRIVATE "/etc/ftpgroups" #ifndef _PATH_UTMP - #define _PATH_UTMP "/etc/utmp" ---- 29,41 ---- +! #define _PATH_UTMP "/etc/utmp" +! #define _PATH_WTMP "/usr/adm/wtmp" +! #define _PATH_LASTLOG "/usr/adm/lastlog" + #endif + + #define _PATH_BSHELL "/bin/sh" +--- 29,46 ---- * * @(#)pathnames.h 5.2 (Berkeley) 6/1/90 */ -! #define _PATH_FTPUSERS "!!PREFIX!!/etc/ftpusers" -! #define _PATH_FTPACCESS "!!PREFIX!!/etc/ftpaccess" +! #define _PATH_FTPUSERS "/usr/local/etc/ftpusers" + #define _PATH_FTPACCESS "/usr/local/etc/ftpaccess" #define _PATH_EXECPATH "/bin/ftp-exec" -! #define _PATH_PIDNAMES "!!PREFIX!!/daemon/ftpd/ftp.pids-%s" -! #define _PATH_CVT "!!PREFIX!!/etc/ftpconversions" +! #define _PATH_PIDNAMES "/var/run/ftp.pids-%s" + #define _PATH_CVT "/usr/local/etc/ftpconversions" ! #define _PATH_XFERLOG "/var/log/xferlog" -! #define _PATH_PRIVATE "!!PREFIX!!/etc/ftpgroups" +! #define _PATH_PRIVATE "/usr/local/etc/ftpgroups" #ifndef _PATH_UTMP - #define _PATH_UTMP "/etc/utmp" -*************** -*** 47,52 **** - #define _PATH_DEVNULL "/dev/null" - - #ifdef HOST_ACCESS -! #define _PATH_FTPHOSTS "/usr/local/etc/ftphosts" +! #define _PATH_UTMP "/var/run/utmp" +! #define _PATH_WTMP "/var/log/wtmp" +! #define _PATH_LASTLOG "/var/log/lastlog" #endif ---- 47,53 ---- - #define _PATH_DEVNULL "/dev/null" + #define _PATH_BSHELL "/bin/sh" +*************** +*** 48,52 **** +--- 48,53 ---- #ifdef HOST_ACCESS -! #define _PATH_FTPHOSTS "!!PREFIX!!/etc/ftphosts" -! #else + #define _PATH_FTPHOSTS "/usr/local/etc/ftphosts" ++ #else #endif |