diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-07 20:34:26 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-07 20:34:26 +0200 |
commit | ed4393bdc7a4d3b1b59293a3393eb1d6953bac99 (patch) | |
tree | 0ce9ec021bd0ab1cb8849a74be5088f03adcd248 | |
parent | 80e8e3cc0542ac6242d49eaf223146dcbf2fa0da (diff) | |
download | busybox-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.lst | 4 | ||||
-rw-r--r-- | networking/hostname.c | 6 |
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 | |||
99 | dirname - NOFORK | 99 | dirname - NOFORK |
100 | dmesg - runner | 100 | dmesg - runner |
101 | dnsd - daemon | 101 | dnsd - daemon |
102 | dnsdomainname - needs ^C (may talk to DNS servers, which may be down) | 102 | dnsdomainname - noexec. needs ^C (may talk to DNS servers, which may be down) |
103 | dos2unix - noexec. runner | 103 | dos2unix - noexec. runner |
104 | dpkg - runner | 104 | dpkg - runner |
105 | du - runner | 105 | du - runner |
@@ -156,7 +156,7 @@ hdparm - hardware | |||
156 | head - noexec. runner | 156 | head - noexec. runner |
157 | hexdump - noexec. runner | 157 | hexdump - noexec. runner |
158 | hostid - NOFORK | 158 | hostid - NOFORK |
159 | hostname - needs ^C (may talk to DNS servers, which may be down) | 159 | hostname - noexec. needs ^C (may talk to DNS servers, which may be down) |
160 | httpd - daemon | 160 | httpd - daemon |
161 | hush - interactive, longterm | 161 | hush - interactive, longterm |
162 | hwclock - hardware (xioctl(RTC_RD_TIME)) | 162 | hwclock - 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 |