dnsdomainname,hostname: make NOEXEC

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst
index 8ec3bdbe621d56a9f98d3db1fbc6cc5bddb1a8f2..6595b9d2f1383f307defdd63b12ba40a5b9ffc59 100644 (file)
--- a/NOFORK_NOEXEC.lst
+++ b/NOFORK_NOEXEC.lst
@@ -99,7 +99,7 @@ diff - runner
 dirname - NOFORK
 dmesg - runner
 dnsd - daemon
-dnsdomainname - needs ^C (may talk to DNS servers, which may be down)
+dnsdomainname - noexec. needs ^C (may talk to DNS servers, which may be down)
 dos2unix - noexec. runner
 dpkg - runner
 du - runner
@@ -156,7 +156,7 @@ hdparm - hardware
 head - noexec. runner
 hexdump - noexec. runner
 hostid - NOFORK
-hostname - needs ^C (may talk to DNS servers, which may be down)
+hostname - noexec. needs ^C (may talk to DNS servers, which may be down)
 httpd - daemon
 hush - interactive, longterm
 hwclock - hardware (xioctl(RTC_RD_TIME))

diff --git a/networking/hostname.c b/networking/hostname.c
index 7d7c60d18d068cf2180670d80c6b22ac1cbf8490..ea0ff95b78243b78e65bf15c8eab80e2f7c1d792 100644 (file)
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -22,9 +22,9 @@
 //config:      help
 //config:      Alias to "hostname -d".
 
-//                        APPLET_ODDNAME:name           main      location    suid_type     help
-//applet:IF_DNSDOMAINNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
-//applet:IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP))
+//                        APPLET_NOEXEC:name           main      location    suid_type     help
+//applet:IF_DNSDOMAINNAME(APPLET_NOEXEC(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
+//applet:IF_HOSTNAME(     APPLET_NOEXEC(hostname,      hostname, BB_DIR_BIN, BB_SUID_DROP, hostname     ))
 
 //kbuild: lib-$(CONFIG_HOSTNAME) += hostname.o
 //kbuild: lib-$(CONFIG_DNSDOMAINNAME) += hostname.o