aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-08-07 20:34:26 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-08-07 20:34:26 +0200
commited4393bdc7a4d3b1b59293a3393eb1d6953bac99 (patch)
tree0ce9ec021bd0ab1cb8849a74be5088f03adcd248
parent80e8e3cc0542ac6242d49eaf223146dcbf2fa0da (diff)
downloadbusybox-w32-ed4393bdc7a4d3b1b59293a3393eb1d6953bac99.tar.gz
busybox-w32-ed4393bdc7a4d3b1b59293a3393eb1d6953bac99.tar.bz2
busybox-w32-ed4393bdc7a4d3b1b59293a3393eb1d6953bac99.zip
dnsdomainname,hostname: make NOEXEC
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--NOFORK_NOEXEC.lst4
-rw-r--r--networking/hostname.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst
index 8ec3bdbe6..6595b9d2f 100644
--- a/NOFORK_NOEXEC.lst
+++ b/NOFORK_NOEXEC.lst
@@ -99,7 +99,7 @@ diff - runner
99dirname - NOFORK 99dirname - NOFORK
100dmesg - runner 100dmesg - runner
101dnsd - daemon 101dnsd - daemon
102dnsdomainname - needs ^C (may talk to DNS servers, which may be down) 102dnsdomainname - noexec. needs ^C (may talk to DNS servers, which may be down)
103dos2unix - noexec. runner 103dos2unix - noexec. runner
104dpkg - runner 104dpkg - runner
105du - runner 105du - runner
@@ -156,7 +156,7 @@ hdparm - hardware
156head - noexec. runner 156head - noexec. runner
157hexdump - noexec. runner 157hexdump - noexec. runner
158hostid - NOFORK 158hostid - NOFORK
159hostname - needs ^C (may talk to DNS servers, which may be down) 159hostname - noexec. needs ^C (may talk to DNS servers, which may be down)
160httpd - daemon 160httpd - daemon
161hush - interactive, longterm 161hush - interactive, longterm
162hwclock - hardware (xioctl(RTC_RD_TIME)) 162hwclock - hardware (xioctl(RTC_RD_TIME))
diff --git a/networking/hostname.c b/networking/hostname.c
index 7d7c60d18..ea0ff95b7 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -22,9 +22,9 @@
22//config: help 22//config: help
23//config: Alias to "hostname -d". 23//config: Alias to "hostname -d".
24 24
25// APPLET_ODDNAME:name main location suid_type help 25// APPLET_NOEXEC:name main location suid_type help
26//applet:IF_DNSDOMAINNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname)) 26//applet:IF_DNSDOMAINNAME(APPLET_NOEXEC(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
27//applet:IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP)) 27//applet:IF_HOSTNAME( APPLET_NOEXEC(hostname, hostname, BB_DIR_BIN, BB_SUID_DROP, hostname ))
28 28
29//kbuild: lib-$(CONFIG_HOSTNAME) += hostname.o 29//kbuild: lib-$(CONFIG_HOSTNAME) += hostname.o
30//kbuild: lib-$(CONFIG_DNSDOMAINNAME) += hostname.o 30//kbuild: lib-$(CONFIG_DNSDOMAINNAME) += hostname.o