Merge commit '1_23_0' into mergeTIG_1_23_0

Conflicts:
	libbb/lineedit.c

2 files changed, 10 insertions, 1 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 1be87b337..d94b65008 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -144,6 +144,7 @@ lib-$(CONFIG_ADDUSER) += update_passwd.o
 lib-$(CONFIG_DELGROUP) += update_passwd.o
 lib-$(CONFIG_DELUSER) += update_passwd.o
 
+lib-$(CONFIG_FTPD) += correct_password.o
 lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
 lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
 lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
diff --git a/libbb/sysconf.c b/libbb/sysconf.c
index cfad9cdc0..8c1caef5c 100644
--- a/libbb/sysconf.c
+++ b/libbb/sysconf.c
@@ -11,7 +11,15 @@
 #if !defined(bb_arg_max)
 unsigned FAST_FUNC bb_arg_max(void)
 {
-        return sysconf(_SC_ARG_MAX);
+        long r = sysconf(_SC_ARG_MAX);
+
+        /* I've seen a version of uclibc which returned -1.
+         * Guard about it, and also avoid insanely large values
+         */
+        if ((unsigned long)r > 64*1024*1024)
+                r = 64*1024*1024;
+
+        return r;
 }
 #endif