From: Denys Vlasenko Date: Mon, 7 Aug 2017 18:34:26 +0000 (+0200) Subject: dnsdomainname,hostname: make NOEXEC X-Git-Tag: 1_28_0~177 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ed4393bdc7a4d3b1b59293a3393eb1d6953bac99;p=oweals%2Fbusybox.git dnsdomainname,hostname: make NOEXEC Signed-off-by: Denys Vlasenko --- 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 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 7d7c60d18..ea0ff95b7 100644 --- 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