diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/.bld.hlp ../wu-ftpd-2.4.2-beta-11/.bld.hlp --- wu-ftpd-2.4.2-beta-11/.bld.hlp Thu Jan 1 01:00:00 1970 +++ wu-ftpd-2.4.2-beta-11/.bld.hlp Tue Dec 17 01:08:14 1996 @@ -0,0 +1,27 @@ +Usage: build

+ + may be one of the following: + gen : generic make (copy this when porting to a new system) + aix : IBM AIX + bdi : BSD/OS + bsd : BSD + dyn : Dynix + fbs : FreeBSD 2.0 or later + hiu : Hitachi Unix + hpx : HP-UX + lnx : Linux (tested on 2.1.14) + lns : Linux with shadow passwords + nbs : NetBSD 1.0 + nx2 : NeXTstep 2.x + nx3 : NeXTstep 3.x + osf : OSF/1 + ptx : ??? + sco : SCO Unix 3.2v4.2 + sgi : SGI Irix 4.0.5a + sny : Sony NewsOS + sol : SunOS 5.x / Solaris 2.x + s41 : SunOS 4.1.x (requires acc or gcc 2.3.3 or better) + ult : Ultrix 4.x + uxw : UnixWare SVR4.2 + clean : Clean up object files and such to reduce disk space after building. + install: Install ftpd. diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/JEDIPATCH-1 ../wu-ftpd-2.4.2-beta-11/JEDIPATCH-1 --- wu-ftpd-2.4.2-beta-11/JEDIPATCH-1 Thu Jan 1 01:00:00 1970 +++ wu-ftpd-2.4.2-beta-11/JEDIPATCH-1 Mon Dec 16 23:41:38 1996 @@ -0,0 +1,20 @@ + + This patch will add a built-in 'ls' command to wuftpd 2.4.2-beta 11, so : + +- It will improve server's performance, +- It will be more secure, +- No more need to have a 'bin', 'etc' and 'lib' directory in each anonymous +FTP area. So that you can now just have your public files in the 'ftp' account, +- Broken 'ls' caused problems with Macintosh clients. You don't have to +recompile an 'ls' now. + + Also, if you add -DNO_EXEC to the CFLAGS in the src/Makefile, *NO* +external program can be launched in any case. This implies that non-anonymous +clients will automatically use the built-in 'ls' instead of a system one. + This is just an extra security mesure to prevent any unknown hole in +external programs spawning... + Please note that this flag is *NOT* activated by default as the current +built-in 'ls' never shows real user names but 'anonftp'. + + Report any bug, compilation-problem, suggestion or patch to j@edit.fr + My new patches for wuftpd will be available from ftp.edit.fr/pub/j/patches diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/JEDIPATCH-2 ../wu-ftpd-2.4.2-beta-11/JEDIPATCH-2 --- wu-ftpd-2.4.2-beta-11/JEDIPATCH-2 Thu Jan 1 01:00:00 1970 +++ wu-ftpd-2.4.2-beta-11/JEDIPATCH-2 Tue Dec 17 01:02:52 1996 @@ -0,0 +1,47 @@ + + Changes from Jedipatch#1 : + ~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- Idle servers bug removal. +Patch suggered by Michael Brennen + +- Ehanced virtual FTP support. +Patch send by Scott Barker + +------------------------------ Scott said : ---------------------------------- + +Primarily, I allowed for hostnames as well as ip numbers in the ftpaccess +file. I also had the code use the first instance of each "virtual" command in +the ftpaccess file, rather than parsing the whole acl list and using the last +instance. + +Also, I removed the code for what must have been the "old way" of handling +virtual domains, since it's not documented anyway. + +I added a feature of my own (RESTRICTED_VIRTUAL_ADMIN) which allows remote +administration of a virtual ftp site by a single admin account, which is +restricted by chroot() to it's own account, and need not have a valid shell +(thus allowing for /bin/false shells to restrict the remote admin to ftp +only, and prevent the remote admin from accessessing anything but their own +virtual site via ftp). + +------------------------------------------------------------------------------ + +- The built-in 'ls' didn't deal with command-line options. This is now +( lazily ) fixed. + +- Non-anonymous clients that use the built-in ls due to the NO_EXEC option +will now read the real group and owner. + +- Two distinct Linux configurations are now provided. + ./build lnx -> build wuftp for Linux without shadow passwords + ./build lns -> for Linux with shadow passwords + + The source was also patched to compile fine with Linux 2.1.x and libc +5.x.y . + + -=- + + Report any bug, compilation-problem, suggestion or patch to j@edit.fr + My new patches for wuftpd will be available from ftp.edit.fr/pub/j/patches + diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/build ../wu-ftpd-2.4.2-beta-11/build --- wu-ftpd-2.4.2-beta-11/build Mon Apr 15 07:49:54 1996 +++ wu-ftpd-2.4.2-beta-11/build Tue Dec 17 00:50:46 1996 @@ -15,7 +15,8 @@ fbs : FreeBSD 2.0 or later hiu : Hitachi Unix hpx : HP-UX - lnx : Linux (tested on 1.2.8) + lnx : Linux (tested on 2.1.14) + lns : Linux with shadow passwords nbs : NetBSD 1.0 nx2 : NeXTstep 2.x nx3 : NeXTstep 3.x diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/makefiles/Makefile.lns ../wu-ftpd-2.4.2-beta-11/makefiles/Makefile.lns --- wu-ftpd-2.4.2-beta-11/makefiles/Makefile.lns Thu Jan 1 01:00:00 1970 +++ wu-ftpd-2.4.2-beta-11/makefiles/Makefile.lns Mon Apr 15 07:52:06 1996 @@ -0,0 +1,34 @@ +# +# Makefile for Linux 1.2.8 with gcc 2.6.3 +# $Id: Makefile.lnx,v 1.2 1995/06/18 21:33:02 sob Exp $ +# +BINDIR= /usr/bin +ETCDIR= /usr/sbin +MANDIR= /usr/man +MANEXT= 8 +INSTALL= install + +all: + @ echo 'Use the "build" command (shell script) to make ftpd.' + @ echo 'You can say "build help" for details on how it works.' + +install: bin/ftpd bin/ftpcount bin/ftpshut + -mv -f ${ETCDIR}/wu.ftpd ${ETCDIR}/wu.ftpd-old + @echo installing binaries. + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/wu.ftpd + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount + ${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho + @echo installing manpages. + ${INSTALL} -c -o bin -g bin -m 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8 + ${INSTALL} -c -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1 + ${INSTALL} -c -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1 + ${INSTALL} -c -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8 + ${INSTALL} -c -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5 + ${INSTALL} -c -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5 + ${INSTALL} -c -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5 + ${INSTALL} -c -o bin -g bin -m 755 doc/xferlog.5 ${MANDIR}/man5/xferlog.5 + + + + diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.aix ../wu-ftpd-2.4.2-beta-11/src/config/config.aix --- wu-ftpd-2.4.2-beta-11/src/config/config.aix Tue Dec 5 05:31:28 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.aix Tue Dec 17 00:56:03 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define unix #define HAVE_SYMLINK #define AIX diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.bdi ../wu-ftpd-2.4.2-beta-11/src/config/config.bdi --- wu-ftpd-2.4.2-beta-11/src/config/config.bdi Mon Apr 15 07:51:39 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.bdi Tue Dec 17 00:56:01 1996 @@ -2,6 +2,8 @@ * Configuration for BSD/OS * $Id: config.bdi,v 1.6 1996/01/23 06:09:24 sob Exp $ */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #undef HAVE_DIRENT #undef HAVE_D_NAMLEN diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.bsd ../wu-ftpd-2.4.2-beta-11/src/config/config.bsd --- wu-ftpd-2.4.2-beta-11/src/config/config.bsd Tue Dec 5 05:35:51 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.bsd Tue Dec 17 00:55:58 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #undef HAVE_DIRENT #undef HAVE_D_NAMLEN diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.dgx ../wu-ftpd-2.4.2-beta-11/src/config/config.dgx --- wu-ftpd-2.4.2-beta-11/src/config/config.dgx Tue Dec 5 05:16:59 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.dgx Tue Dec 17 00:55:56 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #define SVR4 #undef HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.dyn ../wu-ftpd-2.4.2-beta-11/src/config/config.dyn --- wu-ftpd-2.4.2-beta-11/src/config/config.dyn Tue Dec 5 05:17:24 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.dyn Tue Dec 17 00:55:55 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #define BSD #undef HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.fbs ../wu-ftpd-2.4.2-beta-11/src/config/config.fbs --- wu-ftpd-2.4.2-beta-11/src/config/config.fbs Mon Apr 15 07:51:39 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.fbs Tue Dec 17 00:55:53 1996 @@ -2,6 +2,8 @@ * Configuration file for FreeBSD 2.X * $Id: config.fbs,v 1.4 1996/01/23 06:09:24 sob Exp $ */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #undef HAVE_DIRENT #undef HAVE_D_NAMLEN diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.gen ../wu-ftpd-2.4.2-beta-11/src/config/config.gen --- wu-ftpd-2.4.2-beta-11/src/config/config.gen Tue Dec 5 05:18:20 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.gen Tue Dec 17 00:55:50 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #define BSD #undef HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.hiu ../wu-ftpd-2.4.2-beta-11/src/config/config.hiu --- wu-ftpd-2.4.2-beta-11/src/config/config.hiu Mon Apr 15 07:51:39 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.hiu Tue Dec 17 00:55:48 1996 @@ -2,6 +2,8 @@ * config.h for HIUX * $Id: config.hiu,v 1.1 1995/12/05 09:54:15 sob Exp $ */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #undef BSD #undef HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.hpx ../wu-ftpd-2.4.2-beta-11/src/config/config.hpx --- wu-ftpd-2.4.2-beta-11/src/config/config.hpx Mon Apr 15 07:51:40 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.hpx Tue Dec 17 00:55:45 1996 @@ -2,6 +2,8 @@ * config.h for HPUX * $Id: config.hpx,v 1.4 1995/12/05 09:54:15 sob Exp $ */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #undef BSD #undef HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.isc ../wu-ftpd-2.4.2-beta-11/src/config/config.isc --- wu-ftpd-2.4.2-beta-11/src/config/config.isc Mon Apr 15 07:51:40 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.isc Tue Dec 17 00:55:41 1996 @@ -2,6 +2,8 @@ * Interactive Unix configuration * $Id: config.isc,v 1.3 1995/12/05 09:54:15 sob Exp $ */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #ifdef ISC #include #include diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.lns ../wu-ftpd-2.4.2-beta-11/src/config/config.lns --- wu-ftpd-2.4.2-beta-11/src/config/config.lns Thu Jan 1 01:00:00 1970 +++ wu-ftpd-2.4.2-beta-11/src/config/config.lns Tue Dec 17 00:55:38 1996 @@ -0,0 +1,44 @@ +/* + * Linux configuration file + * $Id: config.lnx,v 1.7 1996/03/15 06:26:59 sob Exp $ + */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID +#undef BSD +#define HAVE_DIRENT +#define HAVE_FLOCK +#define HAVE_FTW +#define HAVE_GETCWD +#define HAVE_GETDTABLESIZE +#undef HAVE_PSTAT +#define HAVE_ST_BLKSIZE +#undef HAVE_SYSINFO +#define HAVE_UT_UT_HOST +#define HAVE_VPRINTF +#define LINUX +#define OVERWRITE +#undef REGEX +#define SPT_TYPE SPT_REUSEARGV +#define SHADOW_PASSWORD +#define UPLOAD +#undef USG +#define SVR4 +#define FACILITY LOG_DAEMON +#define HAVE_SYS_VFS +#define HAVE_SYMLINK +#define UTMAXTYPE +#define USE_ETC +#define USE_LOG +#define USE_VAR +#define VIRTUAL + +#include +#include /* here instead of in all the srcs. _H*/ +#include + +typedef void SIGNAL_TYPE; + +#include "../config.h" + +#define realpath realpath_on_steroids /* hack to work around unistd.h */ + diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.lnx ../wu-ftpd-2.4.2-beta-11/src/config/config.lnx --- wu-ftpd-2.4.2-beta-11/src/config/config.lnx Mon Apr 15 07:51:40 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.lnx Tue Dec 17 00:55:35 1996 @@ -2,6 +2,8 @@ * Linux configuration file * $Id: config.lnx,v 1.7 1996/03/15 06:26:59 sob Exp $ */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #undef BSD #define HAVE_DIRENT #define HAVE_FLOCK diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.nbs ../wu-ftpd-2.4.2-beta-11/src/config/config.nbs --- wu-ftpd-2.4.2-beta-11/src/config/config.nbs Mon Apr 15 07:51:40 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.nbs Tue Dec 17 00:55:31 1996 @@ -4,6 +4,8 @@ * */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #define HAVE_DIRENT #undef HAVE_D_NAMLEN diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.nx2 ../wu-ftpd-2.4.2-beta-11/src/config/config.nx2 --- wu-ftpd-2.4.2-beta-11/src/config/config.nx2 Tue Dec 5 05:20:58 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.nx2 Tue Dec 17 00:55:27 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #include /* defined BSD */ #undef HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.nx3 ../wu-ftpd-2.4.2-beta-11/src/config/config.nx3 --- wu-ftpd-2.4.2-beta-11/src/config/config.nx3 Tue Dec 5 05:21:27 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.nx3 Tue Dec 17 00:55:25 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #include #undef HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.osf ../wu-ftpd-2.4.2-beta-11/src/config/config.osf --- wu-ftpd-2.4.2-beta-11/src/config/config.osf Tue Dec 5 05:21:46 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.osf Tue Dec 17 00:55:22 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #define HAVE_DIRENT #define HAVE_D_NAMLEN diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.ptx ../wu-ftpd-2.4.2-beta-11/src/config/config.ptx --- wu-ftpd-2.4.2-beta-11/src/config/config.ptx Tue Dec 5 05:22:12 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.ptx Tue Dec 17 00:55:20 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #undef BSD #define HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.s41 ../wu-ftpd-2.4.2-beta-11/src/config/config.s41 --- wu-ftpd-2.4.2-beta-11/src/config/config.s41 Fri Mar 15 09:59:29 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.s41 Tue Dec 17 00:55:18 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #undef BSD #define HAVE_SYMLINK #undef HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.sco ../wu-ftpd-2.4.2-beta-11/src/config/config.sco --- wu-ftpd-2.4.2-beta-11/src/config/config.sco Mon Apr 15 07:51:41 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.sco Tue Dec 17 00:55:15 1996 @@ -8,6 +8,8 @@ /* End of configurable parameters for SCO. Leave the below as it is. */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #undef BSD #define HAVE_DIRENT #undef HAVE_FLOCK diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.sgi ../wu-ftpd-2.4.2-beta-11/src/config/config.sgi --- wu-ftpd-2.4.2-beta-11/src/config/config.sgi Mon Apr 15 07:51:41 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.sgi Tue Dec 17 00:55:10 1996 @@ -2,6 +2,8 @@ * Configuration file for SGI IRIX 5.3 * $Id: config.sgi,v 1.3 1996/01/23 06:09:24 sob Exp $ */ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #undef F_SETOWN #undef IP_TOS diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.sny ../wu-ftpd-2.4.2-beta-11/src/config/config.sny --- wu-ftpd-2.4.2-beta-11/src/config/config.sny Tue Dec 5 05:24:18 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.sny Tue Dec 17 00:55:06 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #define BSD #undef HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.sol ../wu-ftpd-2.4.2-beta-11/src/config/config.sol --- wu-ftpd-2.4.2-beta-11/src/config/config.sol Sun Mar 31 11:45:28 1996 +++ wu-ftpd-2.4.2-beta-11/src/config/config.sol Tue Dec 17 00:55:04 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #undef F_SETOWN #define HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.ult ../wu-ftpd-2.4.2-beta-11/src/config/config.ult --- wu-ftpd-2.4.2-beta-11/src/config/config.ult Tue Dec 5 05:24:59 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.ult Tue Dec 17 00:55:02 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_FLOCK #define HAVE_GETDTABLESIZE #define HAVE_ST_BLKSIZE diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/config/config.uxw ../wu-ftpd-2.4.2-beta-11/src/config/config.uxw --- wu-ftpd-2.4.2-beta-11/src/config/config.uxw Tue Dec 5 05:25:14 1995 +++ wu-ftpd-2.4.2-beta-11/src/config/config.uxw Tue Dec 17 00:54:53 1996 @@ -1,3 +1,5 @@ +#undef DONT_HAVE_GETPWUID +#undef DONT_HAVE_GETGRGID #define HAVE_SYMLINK #undef F_SETOWN #define HAVE_DIRENT diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/ftpcmd.y ../wu-ftpd-2.4.2-beta-11/src/ftpcmd.y --- wu-ftpd-2.4.2-beta-11/src/ftpcmd.y Mon Apr 15 07:51:06 1996 +++ wu-ftpd-2.4.2-beta-11/src/ftpcmd.y Mon Dec 16 23:41:38 1996 @@ -325,23 +325,37 @@ } | LIST check_login CRLF = { - if (log_commands) syslog(LOG_INFO, "LIST"); - if ($2) - if (anonymous && dolreplies) - retrieve(ls_long, ""); - else - retrieve(ls_short, ""); - } + if (log_commands) syslog(LOG_INFO, "LIST"); + if ($2) + if (anonymous && dolreplies) + fakeretrieve(ls_long, ""); + else +#ifndef NO_EXEC + if (anonymous != 0) +#endif + fakeretrieve(ls_short, ""); +#ifndef NO_EXEC + else + retrieve(ls_short, ""); +#endif + } | LIST check_login SP pathname CRLF = { - if (log_commands) syslog(LOG_INFO, "LIST %s", $4); - if ($2 && $4 != NULL) - if (anonymous && dolreplies) - retrieve(ls_long, $4); - else - retrieve(ls_short, $4); - if ($4 != NULL) - free($4); + if (log_commands) syslog(LOG_INFO, "LIST %s", $4); + if ($2 && $4 != NULL) + if (anonymous && dolreplies) + fakeretrieve(ls_long, $4); + else +#ifndef NO_EXEC + if (anonymous != 0) +#endif + fakeretrieve(ls_short, $4); +#ifndef NO_EXEC + else + retrieve(ls_short, $4); +#endif + if ($4 != NULL) + free($4); } | STAT check_login SP pathname CRLF = { diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/ftpd.c ../wu-ftpd-2.4.2-beta-11/src/ftpd.c --- wu-ftpd-2.4.2-beta-11/src/ftpd.c Mon Apr 15 07:51:11 1996 +++ wu-ftpd-2.4.2-beta-11/src/ftpd.c Mon Dec 16 23:41:38 1996 @@ -152,6 +152,8 @@ #include #endif +#include "ls.h" + #if (defined(_BSDI_VERSION) && (_BSDI_VERSION < 199501)) /* before version 2 */ #define LONGOFF_T /* sizeof(off_t) == sizeof(long) */ #endif @@ -213,6 +215,7 @@ int virtual_mode=0; struct sockaddr_in virtual_addr; struct sockaddr_in *virtual_ptr; +char virtual_hostname[MAXHOSTNAMELEN]; char virtual_root[MAXPATHLEN]; char virtual_banner[MAXPATHLEN]; char virtual_logfile[MAXPATHLEN]; @@ -378,7 +381,11 @@ #ifdef VIRTUAL int virtual_len; - int set; + int set_root, set_banner, set_logfile; + struct hostent *virtual_hostent; + int virtual_addr_idx; + int found_entry; + struct in_addr virtual_in_addr; #endif #ifdef FACILITY @@ -623,53 +630,57 @@ #ifdef VIRTUAL virtual_len = sizeof(virtual_addr); if (getsockname(0, (struct sockaddr *) &virtual_addr, - &virtual_len) < 0) { - virtual_mode = 0; - } - else { - virtual_ptr = (struct sockaddr_in *) &virtual_addr; - set = 0; - entry = (struct aclmember *) NULL; - while (!set && getaclentry("virtual", &entry)) { - if (!strcmp(ARG0, inet_ntoa(virtual_ptr->sin_addr))) { - if (ARG1 != NULL && ARG2 != NULL) { - virtual_mode = 1; - strncpy(virtual_root, ARG1, MAXPATHLEN); - strncpy(virtual_banner, ARG2, MAXPATHLEN); - syslog(LOG_ERR, "VirtualFTP Connect to: %s", - inet_ntoa(virtual_ptr->sin_addr)); - } - } - } - } -#endif - - -#ifdef VIRTUAL - virtual_len = sizeof(virtual_addr); - if (getsockname(0, (struct sockaddr *) &virtual_addr, &virtual_len) < 0) { virtual_mode = 0; } else { virtual_ptr = (struct sockaddr_in *) &virtual_addr; - set = 0; + set_root = 0; + set_banner = 0; + set_logfile = 0; entry = (struct aclmember *) NULL; - while (!set && getaclentry("virtual", &entry)) { - if (!strcmp(ARG0, inet_ntoa(virtual_ptr->sin_addr))) { - if(!strcmp(ARG1, "root")) { - syslog(LOG_NOTICE, "VirtualFTP Connect to: %s", - inet_ntoa(virtual_ptr->sin_addr)); - virtual_mode = 1; - strncpy(virtual_root, ARG2, MAXPATHLEN); - } - if(!strcmp(ARG1, "banner")) - strncpy(virtual_banner, ARG2, MAXPATHLEN); - if(!strcmp(ARG1, "logfile")) - strncpy(virtual_logfile, ARG2, MAXPATHLEN); - } + while ((!set_root || !set_banner || !set_logfile) && + getaclentry("virtual", &entry)) { + if (strcmp(ARG0, inet_ntoa(virtual_ptr->sin_addr))) { + if (!(virtual_hostent = gethostbyname(ARG0)) || + virtual_hostent->h_addrtype != AF_INET) + continue; + found_entry = 0; + for (virtual_addr_idx = 0; + virtual_hostent->h_addr_list[virtual_addr_idx]; + virtual_addr_idx++) { + memcpy(&virtual_in_addr, + virtual_hostent->h_addr_list[virtual_addr_idx], + sizeof(struct in_addr)); + if (virtual_in_addr.s_addr == virtual_ptr->sin_addr.s_addr) { + found_entry = 1; + break; + } + } + if (!found_entry) + continue; + } + + if(!strcmp(ARG1, "root") && !set_root) { + virtual_mode = 1; + strncpy(virtual_hostname, ARG0, MAXHOSTNAMELEN); + set_root = 1; + strncpy(virtual_root, ARG2, MAXPATHLEN); + } + if(!strcmp(ARG1, "banner") && !set_banner) { + set_banner = 1; + strncpy(virtual_banner, ARG2, MAXPATHLEN); + } + if(!strcmp(ARG1, "logfile") && !set_logfile) { + set_logfile = 1; + strncpy(virtual_logfile, ARG2, MAXPATHLEN); + } } } + + if (virtual_mode) + syslog(LOG_NOTICE, "VirtualFTP Connect to: %s (%s)", virtual_hostname, + inet_ntoa(virtual_ptr->sin_addr)); #endif if (is_shutdown(1) != 0) { @@ -1088,6 +1099,18 @@ #endif /* ANON_ONLY */ if ((pw = sgetpwnam(name)) != NULL) { +#ifdef RESTRICTED_VIRTUAL_ADMIN + if (virtual_mode) { + if (strcmp(pw->pw_dir, virtual_root)) { + reply(530, "User %s access denied...", name); + syslog(LOG_NOTICE, + "FTP LOGIN REFUSED (unauthorized access) FROM %s [%s], %s", + remotehost, remoteaddr, name); + pw = (struct passwd *) NULL; + return; + } + } else { +#endif if ((shell = pw->pw_shell) == NULL || *shell == 0) shell = _PATH_BSHELL; while ((cp = getusershell()) != NULL) @@ -1107,6 +1130,9 @@ /* after they log in successfully */ if (use_accessfile) /* see above. _H*/ guest = acl_guestgroup(pw); +#ifdef RESTRICTED_VIRTUAL_ADMIN + } +#endif } if (access_ok(530) < 1) { reply(530, "User %s access denied....", name); @@ -1460,6 +1486,16 @@ } } } + +#ifdef RESTRICTED_VIRTUAL_ADMIN + if (!anonymous && !guest && virtual_mode) { + if (chroot(virtual_root) < 0 || chdir("/") < 0) { + reply(550, "Can't set admin privileges."); + goto bad; + } + } +#endif + #ifdef AIX { /* AIX 3 lossage. Don't ask. It's undocumented. */ @@ -1488,7 +1524,11 @@ goto bad; } #endif +#ifdef RESTRICTED_VIRTUAL_ADMIN + if (!anonymous && !guest && !virtual_mode) { +#else if (!anonymous && !guest) { +#endif if (chdir(pw->pw_dir) < 0) { if (chdir("/") < 0) { reply(530, "User %s: can't change directory to %s.", @@ -1497,8 +1537,7 @@ } else lreply(230, "No directory! Logging in with home=/"); } - } - + } /* * following two lines were inside the next scope... */ @@ -1570,6 +1609,40 @@ void #ifdef __STDC__ +fakeretrieve(char *cmd, char *name) +#else +fakeretrieve(cmd,name) +char *cmd; +char *name; +#endif +{ + FILE *dout; + struct stat st; + + st.st_size = -1; +#ifdef HAVE_ST_BLKSIZE + st.st_blksize = BUFSIZ; +#endif + + if ((dout = dataconn(name, st.st_size, "w")) == NULL) { + return; + } + if (ls(name, dout, +#ifdef HAVE_ST_BLKSIZE + st.st_blksize*2 +#else + BUFSIZ +#endif + ) != 0) { + perror_reply(550, name); + } + (void) fclose(dout); + data = -1; + pdata = -1; +} + +void +#ifdef __STDC__ retrieve(char *cmd, char *name) #else retrieve(cmd,name) @@ -2173,7 +2246,9 @@ if (select(pdata+1, &set, (fd_set *) 0, (fd_set *) 0, &timeout) == 0 || (s = accept(pdata, (struct sockaddr *) &from, &fromlen)) < 0) { #else + alarm(240); s = accept(pdata, (struct sockaddr *) &from, &fromlen); + alarm(0); if (s < 0) { #endif reply(425, "Can't open data connection."); @@ -2322,6 +2397,63 @@ perror_reply(551, "Error on input file"); } +void +#ifdef __STDC__ +send_data2(char *instr, FILE *outstr, off_t blksize) +#else +send_data2(instr,outstr,blksize) +char *instr; +FILE *outstr; +off_t blksize; +#endif +{ + register int c, + cnt; + register char *buf; + int netfd, + filefd; + + transflag++; + if (setjmp(urgcatch)) { + transflag = 0; + return; + } + if (instr == NULL) { + return; + } + switch (type) { + + case TYPE_A: + while ((c = *instr++) != 0) { + byte_count++; + if (c == '\n') { + if (ferror(outstr)) + goto data_err; + (void) putc('\r', outstr); + } + (void) putc(c, outstr); + } + if (ferror(outstr)) + goto data_err; + + return; + + default: + transflag = 0; + reply(550, "Unimplemented TYPE %d in send_data", type); + return; + } + + data_err: + transflag = 0; + perror_reply(426, "Data connection"); + return; + + file_err: + transflag = 0; + perror_reply(551, "Error on input file"); +} + /* Transfer data from peer to "outstr" using the appropriate encapulation of * the data subject to Mode, Structure, and Type. * @@ -2422,12 +2554,15 @@ FILE *fin; int c; +#ifdef EXTERNAL_LS if (anonymous && dolreplies) (void) sprintf(line, ls_long, filename); else (void) sprintf(line, ls_short, filename); fin = ftpd_popen(line, "r", 0); +#endif lreply(211, "status of %s:", filename); +#ifdef EXTERNAL_LS while ((c = getc(fin)) != EOF) { if (c == '\n') { if (ferror(stdout)) { @@ -2446,6 +2581,12 @@ (void) putc(c, stdout); } (void) ftpd_pclose(fin); +#else + if (ls(filename, NULL, 0) != 0) { + perror_reply(551, filename); + return; + } +#endif reply(211, "End of Status"); } @@ -3240,7 +3381,7 @@ /* If user typed "ls -l", etc, and the client used NLST, do what * the user meant. */ if (dirname[0] == '-' && *dirlist == NULL && transflag == 0) { - retrieve("/bin/ls %s", dirname); + fakeretrieve("/bin/ls %s", dirname); return; } perror_reply(550, whichfiles); diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/glob.c ../wu-ftpd-2.4.2-beta-11/src/glob.c --- wu-ftpd-2.4.2-beta-11/src/glob.c Mon Apr 15 07:51:11 1996 +++ wu-ftpd-2.4.2-beta-11/src/glob.c Mon Dec 16 23:41:38 1996 @@ -281,8 +281,10 @@ return; goto patherr2; } +#ifndef LINUX if (fstat(dirp->dd_fd, &stb) < 0) goto patherr1; +#endif if (!isdir(stb)) { errno = ENOTDIR; goto patherr1; diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/ls.c ../wu-ftpd-2.4.2-beta-11/src/ls.c --- wu-ftpd-2.4.2-beta-11/src/ls.c Thu Jan 1 01:00:00 1970 +++ wu-ftpd-2.4.2-beta-11/src/ls.c Tue Dec 17 00:49:52 1996 @@ -0,0 +1,356 @@ + +/* Lame code for wuftpd by Frank Denis */ + +#include "config.h" + +#include +#include +#ifdef HAVE_DIRENT +# include +#else +# include +#endif +#include +#include +#include +#include +#ifdef NO_EXEC +# include +# include +#endif +#ifndef HAVE_SYMLINK +# define lstat stat +#endif +#include +#include +#ifdef HAVE_LOCALE +#include +#endif +#if HAVE_LIMITS_H +# include +#endif +#ifndef PATH_MAX +# define PATH_MAX 255 +#endif + +#include "ls.h" + +enum { + MAX_DATEBUF = 42 +}; + +extern int errno; +extern int transflag; +extern int anonymous; + +#ifdef __STDC__ +static char ftypelet(long bits) +#else +static char ftypelet(bits) +long bits; +#endif +{ +#ifdef S_ISBLK + if (S_ISBLK (bits)) { + return 'b'; + } +#endif + if (S_ISCHR (bits)) { + return 'c'; + } + if (S_ISDIR (bits)) { + return 'd'; + } + if (S_ISREG (bits)) { + return '-'; + } +#ifdef S_ISFIFO + if (S_ISFIFO (bits)) { + return 'p'; + } +#endif +#ifdef S_ISLNK + if (S_ISLNK (bits)) { + return 'l'; + } +#endif +#ifdef S_ISSOCK + if (S_ISSOCK (bits)) { + return 's'; + } +#endif +#ifdef S_ISMPC + if (S_ISMPC (bits)) { + return 'm'; + } +#endif +#ifdef S_ISNWK + if (S_ISNWK (bits)) { + return 'n'; + } +#endif + +#ifdef S_ISOFD + if (S_ISOFD (bits)) { + return 'M'; + } +#endif +#ifdef S_ISOFL + if (S_ISOFL (bits)) { + return 'M'; + } +#endif + return '?'; +} + +#ifdef __STDC__ +static void rwx(unsigned short bits, char *chars) +#else +static void rwx(bits, chars) +unsigned short bits; +char *char; +#endif +{ + chars[0] = (bits & S_IRUSR) ? 'r' : '-'; + chars[1] = (bits & S_IWUSR) ? 'w' : '-'; + chars[2] = (bits & S_IXUSR) ? 'x' : '-'; +} + +#ifdef __STDC__ +static void setst(unsigned short bits, char *chars) +#else +static void setst(bits, chars) +unsigned short bits; +char *chars; +#endif +{ +#ifdef S_ISUID + if (bits & S_ISUID){ + if (chars[3] != 'x') { + chars[3] = 'S'; + } else { + chars[3] = 's'; + } + } +#endif +#ifdef S_ISGID + if (bits & S_ISGID) { + if (chars[6] != 'x') { + chars[6] = 'S'; + } else { + chars[6] = 's'; + } + } +#endif +#ifdef S_ISVTX + if (bits & S_ISVTX) { + if (chars[9] != 'x') { + chars[9] = 'T'; + } else { + chars[9] = 't'; + } + } +#endif +} + +enum { + MAX_MODESTR = 16 +}; + +#ifdef __STDC__ +char *modestring(unsigned short mode) +#else +char *modestring(mode) +unsigned short mode; +#endif +{ + static char str[MAX_MODESTR]; + + str[0] = ftypelet((long) mode); + rwx(mode & 0700, &str[1]); + rwx((mode & 0070) << 3, &str[4]); + rwx((mode & 0007) << 6, &str[7]); + setst(mode, str); + + return str; +} + +enum { + PATH_SEPARATOR = '/', + PATH_CURRENT = '.', + OPTION_PREFIX = '-' +}; + +#ifdef __STDC__ +static const char *skipspaces(const char *str) +#else +static char *skipspaces(str) +char *str; +#endif +{ + while (*str != 0 && isspace(*str) != 0) { + str++; + } + return str; +} + +#ifdef __STDC__ +static const char *nextspace(const char *str) +#else +static char *nextspace(str) +char *str; +#endif +{ + while (*str != 0 && isspace(*str) == 0) { + str++; + } + return str; +} + +#define ANONYMOUS_USER "anonftp" +#define UNKNOWN_USER "other" + +#ifdef __STDC__ +int ls(const char *path, FILE *dout, off_t blksize) +#else +int ls(path, dout, off_t) +char *path; +FILE *dout; +off_t blksize; +#endif +{ + static char datebuf[MAX_DATEBUF + 1]; + static char pathbuf[PATH_MAX * 2 + 1]; + static char regexbuf[PATH_MAX * 2 + 1]; + static char linebuf[PATH_MAX + 84]; + char *pathbufend; + DIR *dir; + struct dirent *ent; +#ifdef __STDC__ + const char *name; + char *lsuser, *lsgroup; +#else + char *name; + const char *lsuser, *lsgroup; +#endif + char *regex = NULL; + size_t pathlen; + time_t now = time(NULL); + struct stat status; +#ifdef __STDC__ + const struct passwd *pwd; + const struct group *grp; +#else + struct passwd *pwd; + struct group *grp; +#endif + + lsuser = lsgroup = ANONYMOUS_USER; + + for (;;) { + path = skipspaces(path); + if (*path != OPTION_PREFIX) { + break; + } + path = nextspace(path); + } + + if ((pathlen = strlen(path)) == 0) { + *pathbuf = PATH_CURRENT; + *(pathbufend = &pathbuf[1]) = 0; + } else { + if (pathlen >= PATH_MAX) { + return 1; + } + memcpy(pathbuf, path, pathlen + 1); + pathbufend = pathbuf + pathlen; + if (lstat(pathbuf, &status) != 0) { + regex = pathbufend - 1; + for (;;) { + if (*regex == PATH_SEPARATOR) { + regex++; + strcpy(regexbuf, regex); + *(pathbufend = regex) = 0; + regex = regexbuf; + break; + } + if (regex == pathbuf) { + strcpy((regex = regexbuf), pathbuf); + *pathbuf = PATH_CURRENT; + *(pathbufend = &pathbuf[1]) = 0; + break; + } + regex--; + } + } + } + if (*(pathbufend - 1) != PATH_SEPARATOR) { + *pathbufend++ = PATH_SEPARATOR; + *pathbufend = 0; + } + dir = opendir(pathbuf); + while ((ent = readdir(dir)) != NULL) { + name = ent->d_name; + if (regex != NULL && fnmatch(regex, name, 0) != 0) { + continue; + } + strncpy(pathbufend, name, PATH_MAX); + if (lstat(pathbuf, &status) != 0) { + continue; + } + strftime(datebuf, MAX_DATEBUF, "%b %d %H:%M:%S %Y", + gmtime(&status.st_mtime)); + if (now > status.st_mtime + 6L * 30L * 24L * 60L * 60L || + now < status.st_mtime - 60L * 60L) { + strcpy(datebuf + 7, datebuf + 15); + } + datebuf[12] = 0; +#ifdef NO_EXEC + if (anonymous == 0) { +# ifndef DONT_HAVE_GETPWUID + if ((pwd = getpwuid(status.st_uid)) == NULL || pwd->pw_name == NULL) { +# endif + lsuser = UNKNOWN_USER; +# ifndef DONT_HAVE_GETPWUID + } else { + lsuser = pwd->pw_name; + } +# endif + +# ifndef DONT_HAVE_GETGRGID + if ((grp = getgrgid(status.st_gid)) == NULL || grp->gr_name == NULL) { +# endif + lsgroup = UNKNOWN_USER; +# ifndef DONT_HAVE_GETPWUID + } else { + lsgroup = grp->gr_name; + } +# endif + } +#endif + if (dout == NULL) { + printf("%s %3lu %-8.8s %-8.8s %8lu %s %s\r\n", + modestring((unsigned short) status.st_mode), + (unsigned long) status.st_nlink, + lsuser, lsgroup, + (unsigned long) status.st_size, + datebuf, + name); + } else { + sprintf(linebuf, "%s %3lu %-8.8s %-8.8s %8lu %s %s\n", + modestring((unsigned short) status.st_mode), + (unsigned long) status.st_nlink, + lsuser, lsgroup, + (unsigned long) status.st_size, + datebuf, + name); + send_data2(linebuf, dout, blksize); + } + } + closedir(dir); + fflush(dout); + transflag = 0; + reply(226, "Transfer complete."); + + return 0; +} diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/ls.h ../wu-ftpd-2.4.2-beta-11/src/ls.h --- wu-ftpd-2.4.2-beta-11/src/ls.h Thu Jan 1 01:00:00 1970 +++ wu-ftpd-2.4.2-beta-11/src/ls.h Mon Dec 16 23:41:38 1996 @@ -0,0 +1,10 @@ + +/* Lame code for wuftpd by Frank Denis */ + +#ifdef __STDC__ +extern int fnmatch(const char *, const char *, int); +extern int ls(const char *, FILE *, off_t); +#else +extern int fnmatch(); +extern int ls(); +#endif diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.aix ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.aix --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.aix Fri Mar 15 07:26:46 1996 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.aix Mon Dec 16 23:41:38 1996 @@ -13,9 +13,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.bdi ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.bdi --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.bdi Tue Dec 5 06:02:58 1995 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.bdi Mon Dec 16 23:41:38 1996 @@ -13,10 +13,10 @@ SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c \ extensions.c realpath.c acl.c private.c authenticate.c conversions.c \ - hostacc.c + hostacc.c ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o \ extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.bsd ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.bsd --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.bsd Fri Apr 1 21:03:30 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.bsd Mon Dec 16 23:41:38 1996 @@ -9,9 +9,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.dgx ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.dgx --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.dgx Fri Apr 1 21:03:32 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.dgx Mon Dec 16 23:41:38 1996 @@ -9,9 +9,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.dyn ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.dyn --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.dyn Fri Apr 1 21:03:30 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.dyn Mon Dec 16 23:41:38 1996 @@ -9,9 +9,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.fbs ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.fbs --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.fbs Tue Jan 23 04:46:09 1996 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.fbs Mon Dec 16 23:41:38 1996 @@ -9,9 +9,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.gen ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.gen --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.gen Fri Apr 1 21:03:27 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.gen Mon Dec 16 23:41:38 1996 @@ -9,9 +9,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.hiu ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.hiu --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.hiu Fri Mar 15 07:26:48 1996 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.hiu Mon Dec 16 23:41:38 1996 @@ -13,9 +13,11 @@ MKDEP = ../util/mkdep.hpx SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.hpx ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.hpx --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.hpx Fri Mar 15 07:26:48 1996 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.hpx Mon Dec 16 23:41:38 1996 @@ -13,9 +13,11 @@ MKDEP = ../util/mkdep.hpx SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.isc ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.isc --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.isc Sun Oct 15 01:08:51 1995 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.isc Mon Dec 16 23:41:38 1996 @@ -9,9 +9,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.lns ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.lns --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.lns Thu Jan 1 01:00:00 1970 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.lns Tue Dec 17 00:52:30 1996 @@ -0,0 +1,60 @@ +# +# Makefile for Linux +# $Id: Makefile.lnx,v 1.3 1996/01/23 06:08:45 sob Exp $ +# +CC = gcc +# YACC = byacc +# debian fix: +YACC = bison -y +IFLAGS = -I.. -I../support -I/usr/include/bsd +LFLAGS = -L../support -s +CFLAGS = -O2 -fno-strength-reduce -fomit-frame-pointer ${IFLAGS} ${LFLAGS} +LIBES = -lsupport -lbsd # -lshadow +LIBC = /usr/lib/libc.a +LINTFLAGS= +LKERB = -lauth -lckrb -lkrb -ldes +MKDEP = ../util/mkdep + +SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c +OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o + +all: ftpd ftpcount ftpshut ckconfig + +ftpcount: ftpcount.c pathnames.h + ${CC} ${CFLAGS} -o $@ ftpcount.c vers.o ${LIBES} + +ftpshut: ftpshut.c pathnames.h + ${CC} ${CFLAGS} -o $@ ftpshut.c vers.o ${LIBES} + +ftpd: ${OBJS} ${LIBC} + ${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBES} + +ckconfig: ckconfig.c + ${CC} ${CFLAGS} -o $@ ckconfig.c + +index: index.o ${LIBC} + ${CC} -Bstatic -o $@ index.o + +vers.o: ftpd.c ftpcmd.y + sh newvers.sh + ${CC} ${CFLAGS} -c vers.c + +clean: + rm -f ${OBJS} ftpd ftpcmd.c ftpshut ftpshut.o ftpcount ftpcount.o + rm -f core index index.o + +cleandir: clean + rm -f tags .depend + +depend: ${SRCS} + ${MKDEP} ${CFLAGS} ${SRCS} + +lint: ${SRCS} + lint ${CFLAGS} ${LINTFLAGS} ${SRCS} + +tags: ${SRCS} + ctags ${SRCS} diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.lnx ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.lnx --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.lnx Fri Mar 15 07:26:49 1996 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.lnx Tue Dec 17 00:52:19 1996 @@ -8,7 +8,7 @@ YACC = bison -y IFLAGS = -I.. -I../support -I/usr/include/bsd LFLAGS = -L../support -s -CFLAGS = -O2 -fomit-frame-pointer ${IFLAGS} ${LFLAGS} +CFLAGS = -O2 -fno-strength-reduce -fomit-frame-pointer ${IFLAGS} ${LFLAGS} LIBES = -lsupport -lbsd # -lshadow LIBC = /usr/lib/libc.a LINTFLAGS= @@ -16,9 +16,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nbs ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nbs --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nbs Thu Oct 5 17:43:11 1995 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nbs Mon Dec 16 23:41:38 1996 @@ -9,9 +9,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nx2 ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nx2 --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nx2 Fri Apr 1 21:03:30 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nx2 Mon Dec 16 23:41:38 1996 @@ -9,9 +9,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nx3 ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nx3 --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nx3 Fri Apr 1 21:03:29 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.nx3 Mon Dec 16 23:41:38 1996 @@ -9,9 +9,12 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c + OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.osf ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.osf --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.osf Fri Mar 15 07:26:49 1996 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.osf Mon Dec 16 23:41:38 1996 @@ -13,9 +13,12 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c + OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.ptx ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.ptx --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.ptx Fri Apr 1 21:03:31 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.ptx Mon Dec 16 23:41:38 1996 @@ -9,9 +9,12 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c + OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.s41 ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.s41 --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.s41 Fri Mar 15 07:26:50 1996 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.s41 Mon Dec 16 23:41:38 1996 @@ -15,9 +15,12 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c + OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sco ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sco --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sco Fri Apr 1 21:03:31 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sco Mon Dec 16 23:41:38 1996 @@ -14,9 +14,12 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c + OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sgi ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sgi --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sgi Sat Mar 16 05:00:39 1996 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sgi Mon Dec 16 23:41:38 1996 @@ -13,9 +13,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sny ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sny --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sny Fri Apr 1 21:03:29 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sny Mon Dec 16 23:41:39 1996 @@ -9,9 +9,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sol ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sol --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sol Sun Jun 18 23:39:47 1995 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.sol Tue Dec 17 00:52:45 1996 @@ -1,7 +1,7 @@ CC = cc IFLAGS = -I.. -I../support LFLAGS = -L../support -CFLAGS = -g -DDEBUG ${IFLAGS} ${LFLAGS} +CFLAGS = -O -DDEBUG ${IFLAGS} ${LFLAGS} LIBES = -lsupport -lsocket -lnsl -lgen LIBC = /lib/libc.a LINTFLAGS= @@ -9,9 +9,11 @@ MKDEP = makedepend SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.ult ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.ult --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.ult Wed Apr 13 22:55:03 1994 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.ult Mon Dec 16 23:41:39 1996 @@ -10,9 +10,11 @@ MKDEP = ../util/mkdep SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \ - realpath.c acl.c private.c authenticate.c conversions.c hostacc.c + realpath.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \ - realpath.o acl.o private.o authenticate.o conversions.o hostacc.o + realpath.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.uxw ../wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.uxw --- wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.uxw Sun Jun 18 06:27:09 1995 +++ wu-ftpd-2.4.2-beta-11/src/makefiles/Makefile.uxw Mon Dec 16 23:41:39 1996 @@ -9,9 +9,11 @@ MKDEP = makedepend SRCS = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c \ - extensions.c acl.c private.c authenticate.c conversions.c hostacc.c + extensions.c acl.c private.c authenticate.c conversions.c hostacc.c \ + ls.c OBJS = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o \ - extensions.o acl.o private.o authenticate.o conversions.o hostacc.o + extensions.o acl.o private.o authenticate.o conversions.o hostacc.o \ + ls.o all: ftpd ftpcount ftpshut ckconfig diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/newvers.sh ../wu-ftpd-2.4.2-beta-11/src/newvers.sh --- wu-ftpd-2.4.2-beta-11/src/newvers.sh Mon Apr 15 07:51:13 1996 +++ wu-ftpd-2.4.2-beta-11/src/newvers.sh Tue Dec 17 00:15:10 1996 @@ -21,7 +21,7 @@ if [ ! -r edit ]; then echo 0 > edit; fi touch edit awk ' { edit = $1 + 1; }\ -END { printf "char version[] = \"Version wu-2.4.2-academ[BETA-11](%d) ", edit > "vers.c";\ +END { printf "char version[] = \"Version wu-2.4.2-academ[BETA-11-JEDIpatch2](%d) ", edit > "vers.c";\ #LANG= #LC_TIME= printf "%d\n", edit > "edit"; }' < edit diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/src/popen.c ../wu-ftpd-2.4.2-beta-11/src/popen.c --- wu-ftpd-2.4.2-beta-11/src/popen.c Mon Dec 11 10:14:43 1995 +++ wu-ftpd-2.4.2-beta-11/src/popen.c Mon Dec 16 23:41:39 1996 @@ -56,6 +56,37 @@ static int *pids; static int fds; +#ifdef NO_EXEC + +FILE * +#ifdef __STDC__ +ftpd_popen(char *program, char *type, int closestderr) +#else +ftpd_popen(program,type,closestderr) +char *program; +char *type; +int closestderr; +#endif +{ + (void) program; + (void) type; + (void) closestderr; + return NULL; +} + +#ifdef __STDC__ +int ftpd_pclose(FILE * iop) +#else +ftpd_pclose(iop) +FILE * iop; +#endif +{ + (void) iop; + return 0; +} + +#else + FILE * #ifdef __STDC__ ftpd_popen(char *program, char *type, int closestderr) @@ -262,6 +293,6 @@ #endif } - +#endif diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/support/makefiles/Makefile.lns ../wu-ftpd-2.4.2-beta-11/support/makefiles/Makefile.lns --- wu-ftpd-2.4.2-beta-11/support/makefiles/Makefile.lns Thu Jan 1 01:00:00 1970 +++ wu-ftpd-2.4.2-beta-11/support/makefiles/Makefile.lns Tue Dec 17 00:56:49 1996 @@ -0,0 +1,53 @@ +# +# Makefile for Linux 1.2.13 with gcc 2.6.3 +# +# $Id: Makefile.lnx,v 1.5 1996/01/23 06:10:01 sob Exp $ +# +CC = gcc +AR = ar cq +RANLIB = ranlib +LIBC = /lib/libc.a +IFLAGS = +LFLAGS = +CFLAGS = -O2 -fno-strength-reduce -fomit-frame-pointer ${IFLAGS} ${LFLAGS} + +SRCS = fnmatch.c strcasestr.c authuser.c +OBJS = fnmatch.o strcasestr.o authuser.o + +all: $(OBJS) + -rm -f libsupport.a + ${AR} libsupport.a $(OBJS) + ${RANLIB} libsupport.a + +clean: + -rm -f *.o libsupport.a + +ftp.h: + install -c -m 444 ftp.h /usr/include/arpa + +paths.h: + install -c -m 444 paths.h /usr/include + +fnmatch.o: fnmatch.c + ${CC} ${CFLAGS} -c fnmatch.c + +getusershell.o: getusershell.c + ${CC} ${CFLAGS} -c getusershell.c + +strerror.o: strerror.c + ${CC} ${CFLAGS} -c strerror.c + +strdup.o: strdup.c + ${CC} ${CFLAGS} -c strdup.c + +strcasestr.o: strcasestr.c + ${CC} ${CFLAGS} -c strcasestr.c + +strsep.o: strsep.c + ${CC} ${CFLAGS} -c strsep.c + +authuser.o: authuser.c + ${CC} ${CFLAGS} -c authuser.c + +ftw.o: ftw.c + ${CC} ${CFLAGS} -c ftw.c diff -u --new-file --recursive wu-ftpd-2.4.2-beta-11/support/makefiles/Makefile.lnx ../wu-ftpd-2.4.2-beta-11/support/makefiles/Makefile.lnx --- wu-ftpd-2.4.2-beta-11/support/makefiles/Makefile.lnx Mon Apr 15 07:52:29 1996 +++ wu-ftpd-2.4.2-beta-11/support/makefiles/Makefile.lnx Tue Dec 17 00:56:40 1996 @@ -9,7 +9,7 @@ LIBC = /lib/libc.a IFLAGS = LFLAGS = -CFLAGS = -O2 -fomit-frame-pointer ${IFLAGS} ${LFLAGS} +CFLAGS = -O2 -fno-strength-reduce -fomit-frame-pointer ${IFLAGS} ${LFLAGS} SRCS = fnmatch.c strcasestr.c authuser.c OBJS = fnmatch.o strcasestr.o authuser.o