grr@cbmvax.UUCP (George Robbins) (05/30/89)
Index: etc/ftpd networking Fix Description: The version of ftpd.c included with the networking release believes there is a local copy of popen that has the open/close routines prefixed by ftpd_. However, the version of popen that is included in the directory doesn't have such prefixes. Also, ftpd uses a local copy of logwtmp, instead of version in the 'util' library implemented by the network release. Repeat-By: Try to build ftpd from the networking sources. Fix: Either edit the copy of popen.c to include the prefixes or make changes to the makefile as below to effect this dynamically. Note: As released, glob.c is a symbolic link to ../ftp/glob.c - if the sources are merged into 4.3 tahoe and ftp takes it's usual place in ucb, then the link must be changed to refer to the normal location of the ftp directory. *** ftpd/Makefile.grr Mon May 29 15:04:28 1989 --- ftpd/Makefile Mon May 29 15:17:03 1989 *************** *** 18,36 **** # CFLAGS= -O LIBC= /lib/libc.a ! SRCS= ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c ! OBJS= ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o MAN= ftpd.0 all: ftpd ftpd: ${OBJS} ${LIBC} ! ${CC} -o $@ ${OBJS} vers.o: ftpd.c ftpcmd.y sh newvers.sh ${CC} ${CFLAGS} -c vers.c clean: rm -f ${OBJS} ftpd core ftpcmd.c --- 18,41 ---- # CFLAGS= -O LIBC= /lib/libc.a ! SRCS= ftpd.c ftpcmd.c glob.c popen.c vers.c ! OBJS= ftpd.o ftpcmd.o glob.o popen.o vers.o MAN= ftpd.0 all: ftpd ftpd: ${OBJS} ${LIBC} ! ${CC} -o $@ ${OBJS} -lutil vers.o: ftpd.c ftpcmd.y sh newvers.sh ${CC} ${CFLAGS} -c vers.c + popen.o: popen.c + sed -e '/^popen(/s//ftpd_&/' -e '/^pclose(/s//ftpd_&/' popen.c > temp.c + ${CC} ${CFLAGS} -c temp.c + mv temp.o popen.o + -rm temp.c clean: rm -f ${OBJS} ftpd core ftpcmd.c -- George Robbins - now working for, uucp: {uunet|pyramid|rutgers}!cbmvax!grr but no way officially representing arpa: cbmvax!grr@uunet.uu.net Commodore, Engineering Department fone: 215-431-9255 (only by moonlite)