*** src/pathnames.h.orig Mon Dec 22 00:25:08 1997 --- src/pathnames.h Mon Mar 2 19:13:35 1998 *************** *** 45,54 **** #define _PATH_CVT "/etc/ftpd/ftpconversions" #define _PATH_PRIVATE "/etc/ftpd/ftpgroups" #else ! #define _PATH_FTPUSERS "/usr/local/lib/ftpd/ftpusers" ! #define _PATH_FTPACCESS "/usr/local/lib/ftpd/ftpaccess" ! #define _PATH_CVT "/usr/local/lib/ftpd/ftpconversions" ! #define _PATH_PRIVATE "/usr/local/lib/ftpd/ftpgroups" #endif #endif --- 45,54 ---- #define _PATH_CVT "/etc/ftpd/ftpconversions" #define _PATH_PRIVATE "/etc/ftpd/ftpgroups" #else ! #define _PATH_FTPUSERS PREFIX "/etc/ftpusers" ! #define _PATH_FTPACCESS PREFIX "/etc/ftpaccess" ! #define _PATH_CVT PREFIX "/etc/ftpconversions" ! #define _PATH_PRIVATE PREFIX "/etc/ftpgroups" #endif #endif *************** *** 69,78 **** #endif #else #ifndef _PATH_PIDNAMES ! #define _PATH_PIDNAMES "/usr/local/lib/ftpd/pids/%s" #endif #ifndef _PATH_XFERLOG ! #define _PATH_XFERLOG "/usr/local/logs/xferlog" #endif #endif --- 69,78 ---- #endif #else #ifndef _PATH_PIDNAMES ! #define _PATH_PIDNAMES "/var/run/%s" #endif #ifndef _PATH_XFERLOG ! #define _PATH_XFERLOG "/var/logs/xferlog" #endif #endif *************** *** 117,123 **** #ifdef USE_ETC_FTPD #define _PATH_FTPHOSTS "/etc/ftpd/ftphosts" #else ! #define _PATH_FTPHOSTS "/usr/local/lib/ftpd/ftphosts" #endif #endif #endif --- 117,123 ---- #ifdef USE_ETC_FTPD #define _PATH_FTPHOSTS "/etc/ftpd/ftphosts" #else ! #define _PATH_FTPHOSTS PREFIX "/etc/ftphosts" #endif #endif #endif