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

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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1535
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
1 Busybox 1.19 let ftpd upload for non-root users. 1.20 broke that.
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
2
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
3 diff --git a/networking/ftpd.c b/networking/ftpd.c
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
4 index 33db964..761f239 100644
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
5 --- a/networking/ftpd.c
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
6 +++ b/networking/ftpd.c
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
7 @@ -1180,7 +1180,8 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
8 #endif
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
9
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
10 if (argv[optind]) {
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
11 - xchroot(argv[optind]);
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
12 + xchdir(argv[optind]);
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
13 + if (!getpid()) xchroot(".");
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
14 }
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
15
2d264744ac3a Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
Rob Landley <rob@landley.net>
parents:
diff changeset
16 //umask(077); - admin can set umask before starting us