hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge: busybox: update CONFIG_NSLOOKUP in busybox config and respective patch 

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
openwrt-18.06
Zoltan HERPAI 2017-11-07 09:45:55 +01:00 committed by Felix Fietkau
parent 23f774f727
commit d1ba483472
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/utils/busybox/Config-defaults.in
View File

@ -2332,10 +2332,10 @@ config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
config BUSYBOX_DEFAULT_NSLOOKUP
bool
default n
config BUSYBOX_DEFAULT_NSLOOKUP_LEDE
config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
bool
default y
config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
bool
default n
config BUSYBOX_DEFAULT_NTPD

12
package/utils/busybox/config/networking/Config.in
View File

@ -700,17 +700,17 @@ config BUSYBOX_CONFIG_NSLOOKUP
default BUSYBOX_DEFAULT_NSLOOKUP
help
nslookup is a tool to query Internet name servers.
config BUSYBOX_CONFIG_NSLOOKUP_LEDE
config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT
bool "nslookup_lede"
depends on !BUSYBOX_CONFIG_NSLOOKUP
default BUSYBOX_DEFAULT_NSLOOKUP_LEDE
default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
help
nslookup is a tool to query Internet name servers (LEDE flavor).
nslookup is a tool to query Internet name servers (OpenWrt flavor).
config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
bool "Enable long options"
default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS
default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
help
Support long options for the nslookup applet.
config BUSYBOX_CONFIG_NTPD

16
package/utils/busybox/patches/230-add_nslookup_lede.patch
View File

@ -53,23 +53,23 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+//config:config NSLOOKUP_LEDE
+//config: bool "nslookup_lede"
+//config:config NSLOOKUP_OPENWRT
+//config: bool "nslookup_openwrt"
+//config: depends on !NSLOOKUP
+//config: default y
+//config: help
+//config: nslookup is a tool to query Internet name servers (LEDE flavor).
+//config:
+//config:config FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
+//config:config FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+//config: bool "Enable long options"
+//config: default y
+//config: depends on NSLOOKUP_LEDE && LONG_OPTS
+//config: depends on NSLOOKUP_OPENWRT && LONG_OPTS
+//config: help
+//config: Support long options for the nslookup applet.
+
+//applet:IF_NSLOOKUP_LEDE(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_NSLOOKUP_OPENWRT(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_NSLOOKUP_LEDE) += nslookup_lede.o
+//kbuild:lib-$(CONFIG_NSLOOKUP_OPENWRT) += nslookup_lede.o
+
+//usage:#define nslookup_lede_trivial_usage
+//usage: "[HOST] [SERVER]"
@ -753,7 +753,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+}
+
+
+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
+#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+static const char nslookup_longopts[] ALIGN1 =
+ "type\0" Required_argument "q"
+ "querytype\0" Required_argument "q"
@ -778,7 +778,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+ unsigned int types = 0;
+ HEADER *header;
+
+#if ENABLE_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
+#if ENABLE_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
+ applet_long_options = nslookup_longopts;
+#endif
+