summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griebl2002-07-18 23:59:17 +0000
committerRobert Griebl2002-07-18 23:59:17 +0000
commit88947dd05e28a3b793b16dfd6db1b5414ca99017 (patch)
tree02c3da3a9f7dcc562517bae2bc7cfca107d5cbd5
parent2c0d0f00513e44f8545eb0756f874a25f54f9b40 (diff)
downloadbusybox-88947dd05e28a3b793b16dfd6db1b5414ca99017.zip
busybox-88947dd05e28a3b793b16dfd6db1b5414ca99017.tar.gz
Added a compile time option to suppress the "Using fallback.." message
if no busybox.conf file is existant.
-rw-r--r--applets/applets.c2
-rw-r--r--sysdeps/linux/config.in3
2 files changed, 5 insertions, 0 deletions
diff --git a/applets/applets.c b/applets/applets.c
index 1a27419..a6e6598 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 adcc770..d799c94 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