-diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h
---- busybox.old/include/applets.h 2006-01-11 01:32:47.302791000 +0100
-+++ busybox.dev/include/applets.h 2006-01-11 01:33:18.744756250 +0100
-@@ -475,6 +475,9 @@
- #ifdef CONFIG_NC
- APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
- #endif
-+#ifdef CONFIG_NETMSG
-+ APPLET_NOUSAGE("netmsg", netmsg_main, _BB_DIR_BIN, _BB_SUID_ALWAYS)
-+#endif
- #ifdef CONFIG_NETSTAT
- APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER)
+--- a/include/applets.h
++++ b/include/applets.h
+@@ -278,6 +278,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D
+ IF_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_DROP))
+ IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP))
+ IF_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_DROP))
++IF_NETMSG(APPLET(netmsg, _BB_DIR_BIN, _BB_SUID_REQUIRE))
+ IF_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_DROP))
+ IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP))
+ IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+--- a/include/usage.h
++++ b/include/usage.h
+@@ -3101,6 +3101,9 @@
+
#endif
-diff -urN busybox.old/networking/Config.in busybox.dev/networking/Config.in
---- busybox.old/networking/Config.in 2005-11-01 00:55:15.000000000 +0100
-+++ busybox.dev/networking/Config.in 2006-01-11 01:33:18.744756250 +0100
-@@ -435,6 +435,12 @@
- help
+
++#define netmsg_trivial_usage NOUSAGE_STR
++#define netmsg_full_usage ""
++
+ #define netstat_trivial_usage \
+ "[-laentuwxr"IF_FEATURE_NETSTAT_WIDE("W")IF_FEATURE_NETSTAT_PRG("p")"]"
+ #define netstat_full_usage "\n\n" \
+--- a/networking/Config.in
++++ b/networking/Config.in
+@@ -617,6 +617,12 @@ config NC
A simple Unix utility which reads and writes data across network
connections.
-+
-+config CONFIG_NETMSG
+
++config NETMSG
+ bool "netmsg"
+ default n
+ help
+ simple program for sending udp broadcast messages
-
- config CONFIG_NC_GAPING_SECURITY_HOLE
- bool "gaping security hole"
-diff -urN busybox.old/networking/Makefile.in busybox.dev/networking/Makefile.in
---- busybox.old/networking/Makefile.in 2005-11-01 00:55:15.000000000 +0100
-+++ busybox.dev/networking/Makefile.in 2006-01-11 01:34:02.939518250 +0100
-@@ -28,6 +28,7 @@
- NETWORKING-$(CONFIG_IPTUNNEL) += iptunnel.o
- NETWORKING-$(CONFIG_NAMEIF) += nameif.o
- NETWORKING-$(CONFIG_NC) += nc.o
-+NETWORKING-$(CONFIG_NETMSG) += netmsg.o
- NETWORKING-$(CONFIG_NETSTAT) += netstat.o
- NETWORKING-$(CONFIG_NSLOOKUP) += nslookup.o
- NETWORKING-$(CONFIG_PING) += ping.o
-diff -urN busybox.old/networking/netmsg.c busybox.dev/networking/netmsg.c
---- busybox.old/networking/netmsg.c 1970-01-01 01:00:00.000000000 +0100
-+++ busybox.dev/networking/netmsg.c 2006-01-11 01:33:18.748756500 +0100
-@@ -0,0 +1,58 @@
++
+ config NC_SERVER
+ bool "Netcat server options (-l)"
+ default n
+--- a/networking/Kbuild
++++ b/networking/Kbuild
+@@ -25,6 +25,7 @@ lib-$(CONFIG_IP) += ip.o
+ lib-$(CONFIG_IPCALC) += ipcalc.o
+ lib-$(CONFIG_NAMEIF) += nameif.o
+ lib-$(CONFIG_NC) += nc.o
++lib-$(CONFIG_NETMSG) += netmsg.o
+ lib-$(CONFIG_NETSTAT) += netstat.o
+ lib-$(CONFIG_NSLOOKUP) += nslookup.o
+ lib-$(CONFIG_PING) += ping.o
+--- /dev/null
++++ b/networking/netmsg.c
+@@ -0,0 +1,63 @@
++/*
++ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This is free software, licensed under the GNU General Public License v2.
++ */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+int netmsg_main(int argc, char **argv)
+#endif
+{
-+ int s, i;
++ int s;
+ struct sockaddr_in addr;
+ int optval = 1;
+ unsigned char buf[1001];
projects / openwrt.git / blobdiff