Mercurial > hg > aboriginal

diff sources/patches/busybox-ftpd.patch @ 1535:2d264744ac3a 1.2.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
author Rob Landley <rob@landley.net>
date Wed, 22 Aug 2012 19:44:44 -0500
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sources/patches/busybox-ftpd.patch	Wed Aug 22 19:44:44 2012 -0500
@@ -0,0 +1,16 @@
+Busybox 1.19 let ftpd upload for non-root users. 1.20 broke that.
+
+diff --git a/networking/ftpd.c b/networking/ftpd.c
+index 33db964..761f239 100644
+--- a/networking/ftpd.c
++++ b/networking/ftpd.c
+@@ -1180,7 +1180,8 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
+ #endif
+ 
+ 	if (argv[optind]) {
+-		xchroot(argv[optind]);
++		xchdir(argv[optind]);
++		if (!getpid()) xchroot(".");
+ 	}
+ 
+ 	//umask(077); - admin can set umask before starting us