1.0 backports of:

10861, 10875, 10881, 10888 ash fix
10865 suid thing?  (look at this)
10886 telnet bugfix
10866 ftp fix for RFC 959 compliance.
10867 Remove spurious newline from cp -i prompt.
10874 ksyslogd fix
10876 msh fix
10877 httpd fix
10880, 10889, 11005 dhcp fixes

2 files changed, 4 insertions, 3 deletions

diff --git a/busybox/include/applets.h b/busybox/include/applets.h
index 21f82f57d..d89500e77 100644
--- a/busybox/include/applets.h
+++ b/busybox/include/applets.h
@@ -672,7 +672,7 @@
 #endif
 
 #if !defined(PROTOTYPES) && !defined(MAKE_USAGE)
-        { 0,NULL,0 }
+        { 0,NULL,0,0 }
 };
 
 #endif
diff --git a/busybox/include/usage.h b/busybox/include/usage.h
index ad4410196..b58c57275 100644
--- a/busybox/include/usage.h
+++ b/busybox/include/usage.h
@@ -2610,9 +2610,10 @@
         "/dev/tty2\n"
 
 #define udhcpc_trivial_usage \
-        "[-fbnqv] [-c CLIENTID] [-H HOSTNAME] [-i INTERFACE]\n[-p pidfile] [-r IP] [-s script]"
+        "[-Cfbnqv] [-c CLIENTID] [-H HOSTNAME] [-i INTERFACE]\n[-p pidfile] [-r IP] [-s script]"
 #define udhcpc_full_usage \
-        "\t-c,\t--clientid=CLIENTID\tClient identifier\n" \
+        "\t-c,\t--clientid=CLIENTID\tSet client identifier\n" \
+        "\t-C,\t--clientid-none\tSuppress default client identifier\n" \
         "\t-H,\t--hostname=HOSTNAME\tClient hostname\n" \
         "\t-h,\t                   \tAlias for -H\n" \
         "\t-f,\t--foreground\tDo not fork after getting lease\n" \