1 diff -urN ftpd-BSD-0.3.2.orig/ftpd/logutmp.c ftpd-BSD-0.3.2/ftpd/logutmp.c
2 --- ftpd-BSD-0.3.2.orig/ftpd/logutmp.c Fri Jul 7 03:28:18 2000
3 +++ ftpd-BSD-0.3.2/ftpd/logutmp.c Sun Sep 10 01:58:51 2000
8 +#define TRANSFORM_UTMP_FILE_NAME(file_name) \
9 + ((strcmp (file_name, _PATH_UTMP) == 0 \
10 + && access ( _PATH_UTMP "x", F_OK) == 0) ? (_PATH_UTMP "x") : \
11 + ((strcmp (file_name, _PATH_UTMP "x") == 0 \
12 + && access (_PATH_UTMP "x", F_OK) != 0) ? _PATH_UTMP : \
15 typedef struct utmp UTMP;
21 if ((topslot < 0) || ((fd < 0) &&
22 - (fd = open(_PATH_UTMP, O_RDWR|O_CREAT, 0644)) < 0))
23 + (fd = open(TRANSFORM_UTMP_FILE_NAME(_PATH_UTMP), O_RDWR|O_CREAT, 0644)) < 0))
27 diff -urN ftpd-BSD-0.3.2.orig/ftpd/logwtmp.c ftpd-BSD-0.3.2/ftpd/logwtmp.c
28 --- ftpd-BSD-0.3.2.orig/ftpd/logwtmp.c Fri Jul 7 05:04:09 2000
29 +++ ftpd-BSD-0.3.2/ftpd/logwtmp.c Sun Sep 10 01:58:34 2000
31 #include <netinet/in.h>
34 +#define TRANSFORM_WTMP_FILE_NAME(file_name) \
35 + ((strcmp (file_name, _PATH_WTMP) == 0 \
36 + && access ( _PATH_WTMP "x", F_OK) == 0) ? (_PATH_WTMP "x") : \
37 + ((strcmp (file_name, _PATH_WTMP "x") == 0 \
38 + && access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
48 - if (fd < 0 && (fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) < 0)
49 + if (fd < 0 && (fd = open(TRANSFORM_WTMP_FILE_NAME(_PATH_WTMP), O_WRONLY|O_APPEND, 0)) < 0)
51 if (fstat(fd, &buf) == 0) {
52 #ifndef ORIGINAL_SOURCE
53 diff -urN ftpd-BSD-0.3.2.orig/ftpd/pathnames.h ftpd-BSD-0.3.2/ftpd/pathnames.h
54 --- ftpd-BSD-0.3.2.orig/ftpd/pathnames.h Sun Jan 23 15:20:36 2000
55 +++ ftpd-BSD-0.3.2/ftpd/pathnames.h Sun Sep 10 01:53:54 2000
60 -#define _PATH_FTPUSERS "/etc/ftpusers"
61 -#define _PATH_FTPCHROOT "/etc/ftpchroot"
62 -#define _PATH_FTPWELCOME "/etc/ftpwelcome"
63 +#define _PATH_FTPUSERS "/etc/ftpd/ftpusers"
64 +#define _PATH_FTPCHROOT "/etc/ftpd/ftpchroot"
65 +#define _PATH_FTPWELCOME "/etc/ftpd/ftpwelcome"
66 #define _PATH_FTPLOGINMESG "/etc/motd"
67 #define _PATH_FTPDSTATFILE "/var/log/ftpd"
68 #define _PATH_FTPDPID "/var/run/ftpd.pid"