diff options
author | Robert Griebl <griebl@gmx.de> | 2002-07-18 23:59:17 +0000 |
---|---|---|
committer | Robert Griebl <griebl@gmx.de> | 2002-07-18 23:59:17 +0000 |
commit | 88947dd05e28a3b793b16dfd6db1b5414ca99017 (patch) | |
tree | 02c3da3a9f7dcc562517bae2bc7cfca107d5cbd5 | |
parent | 2c0d0f00513e44f8545eb0756f874a25f54f9b40 (diff) | |
download | busybox-w32-88947dd05e28a3b793b16dfd6db1b5414ca99017.tar.gz busybox-w32-88947dd05e28a3b793b16dfd6db1b5414ca99017.tar.bz2 busybox-w32-88947dd05e28a3b793b16dfd6db1b5414ca99017.zip |
Added a compile time option to suppress the "Using fallback.." message
if no busybox.conf file is existant.
-rw-r--r-- | applets/applets.c | 2 | ||||
-rw-r--r-- | sysdeps/linux/config.in | 3 |
2 files changed, 5 insertions, 0 deletions
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 ) | |||
223 | return; | 223 | return; |
224 | } | 224 | } |
225 | else { | 225 | else { |
226 | #ifndef CONFIG_FEATURE_SUID_CONFIG_QUIET | ||
226 | static int onetime = 0; | 227 | static int onetime = 0; |
227 | 228 | ||
228 | if ( !onetime ) { | 229 | if ( !onetime ) { |
229 | onetime = 1; | 230 | onetime = 1; |
230 | fprintf ( stderr, "Using fallback suid method\n" ); | 231 | fprintf ( stderr, "Using fallback suid method\n" ); |
231 | } | 232 | } |
233 | #endif | ||
232 | } | 234 | } |
233 | #endif | 235 | #endif |
234 | 236 | ||
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 | |||
20 | if [ "$CONFIG_FEATURE_SUID" = "y" ]; then | 20 | if [ "$CONFIG_FEATURE_SUID" = "y" ]; then |
21 | bool ' Runtime configuration via /etc/busybox.conf' CONFIG_FEATURE_SUID_CONFIG | 21 | bool ' Runtime configuration via /etc/busybox.conf' CONFIG_FEATURE_SUID_CONFIG |
22 | fi | 22 | fi |
23 | if [ "$CONFIG_FEATURE_SUID_CONFIG" = "y" ]; then | ||
24 | bool ' Suppress message if config file is not readable' CONFIG_FEATURE_SUID_CONFIG_QUIET | ||
25 | fi | ||
23 | endmenu | 26 | endmenu |
24 | 27 | ||
25 | source archival/config.in | 28 | source archival/config.in |