From: Robert Griebl <griebl@gmx.de>
Date: Thu, 18 Jul 2002 23:59:17 +0000 (-0000)
Subject: Added a compile time option to suppress the "Using fallback.." message
X-Git-Tag: 0_60_4~119
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=88947dd05e28a3b793b16dfd6db1b5414ca99017;p=oweals%2Fbusybox.git

Added a compile time option to suppress the "Using fallback.." message
if no busybox.conf file is existant.
---

diff --git a/applets/applets.c b/applets/applets.c
index 1a2741940..a6e6598cc 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -223,12 +223,14 @@ void check_suid ( struct BB_applet *applet )
 		return;
 	}
 	else {
+#ifndef CONFIG_FEATURE_SUID_CONFIG_QUIET	
 		static int onetime = 0;
 		
 		if ( !onetime ) {
 			onetime = 1;
 			fprintf ( stderr, "Using fallback suid method\n" );
 		}
+#endif		
 	}
 #endif
 
diff --git a/sysdeps/linux/config.in b/sysdeps/linux/config.in
index adcc77089..d799c94ea 100644
--- a/sysdeps/linux/config.in
+++ b/sysdeps/linux/config.in
@@ -20,6 +20,9 @@ bool 'Support for SUID/SGID handling'  					CONFIG_FEATURE_SUID
 if [ "$CONFIG_FEATURE_SUID" = "y" ]; then
   bool '  Runtime configuration via /etc/busybox.conf'			CONFIG_FEATURE_SUID_CONFIG
 fi
+if [ "$CONFIG_FEATURE_SUID_CONFIG" = "y" ]; then
+  bool '    Suppress message if config file is not readable'			CONFIG_FEATURE_SUID_CONFIG_QUIET
+fi
 endmenu
 
 source archival/config.in