r1814 - in trunk

[stsp at dslinux.in-berlin.de]

Author: stsp
Date: 2007-07-13 01:20:29 +0200 (Fri, 13 Jul 2007)
New Revision: 1814

Log:
Add ftpd.

Patch by Sonny Jim.


Copied: trunk/user/ftpd (from rev 1813, tags/uclinux/uclinux_20051014/user/ftpd)

Modified: trunk/user/ftpd/Makefile
===================================================================
--- tags/uclinux/uclinux_20051014/user/ftpd/Makefile	2007-07-12 22:46:15 UTC (rev 1813)
+++ trunk/user/ftpd/Makefile	2007-07-12 23:20:29 UTC (rev 1814)
@@ -7,7 +7,7 @@
 CFLAGS += -DPATH_FTPLOGINMESG=\"/etc/motd\"
 CFLAGS += -DPATH_FTPUSERS=\"/etc/ftpusers\"
 CFLAGS += -DPATH_BSHELL=\"/bin/sh\"
-CFLAGS += -DPATH_FTPCHROOT=\"/usr/sbin/chroot\"
+CFLAGS += -DPATH_FTPCHROOT=\"/bin/chroot\"
 CFLAGS += -DPATH_FTPDPID=\"/var/run/ftpd.pid\"
 CFLAGS += -DPATH_DEVNULL=\"/dev/null\"
 
@@ -30,8 +30,15 @@
 romfs:
 	$(ROMFSINST) /bin/$(EXEC)
 	$(ROMFSINST) -e CONFIG_USER_FTPD_FTPD \
-		-a "ftp     stream tcp nowait root /bin/ftpd -l" /etc/inetd.conf
+		-a "#ftp     stream tcp nowait root /usr/bin/ftpd -l" /etc/inetd.conf.example
 
+	$(ROMFSINST) -e CONFIG_USER_FTPD_FTPD \
+	-a "ftp 21/tcp" /etc/services
+
+	$(ROMFSINST) -e CONFIG_USER_FTPD_FTPD \
+	-a "ftp-data 20/tcp" /etc/services
+	$(ROMFSINST) -e CONFIG_USER_FTPD_FTPD \
+	-a "ftp-data 20/udp" /etc/services
 clean:
 	-rm -f $(EXEC) *.elf *.elf2flt *.gdb *.o
 

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2007-07-12 22:46:15 UTC (rev 1813)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2007-07-12 23:20:29 UTC (rev 1814)
@@ -216,7 +216,7 @@
 # CONFIG_USER_FAKEIDENTD_IDENTD is not set
 # CONFIG_USER_DDNS3_CLIENT_DDNS3 is not set
 # CONFIG_USER_FTP_FTP_FTP is not set
-# CONFIG_USER_FTPD_FTPD is not set
+CONFIG_USER_FTPD_FTPD=y
 # CONFIG_USER_FREESWAN is not set
 # CONFIG_USER_OPENSWAN is not set
 # CONFIG_USER_HTTPD_HTTPD is not set