diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-03-30 18:17:35 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-03-30 18:17:35 +0200 |
commit | 80f0f1d712fb3ab236e1fc8b37dfa7a9224d7849 (patch) | |
tree | d9275d6616444118bda6715c63f1f2ae87445797 | |
parent | 2a17fbe88a0cc064248db4ce8939f0fbc357922d (diff) | |
download | busybox-w32-80f0f1d712fb3ab236e1fc8b37dfa7a9224d7849.tar.gz busybox-w32-80f0f1d712fb3ab236e1fc8b37dfa7a9224d7849.tar.bz2 busybox-w32-80f0f1d712fb3ab236e1fc8b37dfa7a9224d7849.zip |
setfiles: switch bb_info_msg to printf
Presumably, bb_info_msg was used here for syslog logging (-l),
but there is no actual code to activate syslog logging.
Added a TODO note on that, so that selinux users would notice
and fix if needed.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | selinux/setfiles.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index c974c4a9d..de99dfe44 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
@@ -17,6 +17,7 @@ | |||
17 | //usage: ) | 17 | //usage: ) |
18 | //usage: "\n -d Show which specification matched each file" | 18 | //usage: "\n -d Show which specification matched each file" |
19 | //usage: "\n -l Log changes in file labels to syslog" | 19 | //usage: "\n -l Log changes in file labels to syslog" |
20 | //TODO: log to syslog is not yet implemented, it goes to stdout only now | ||
20 | //usage: "\n -n Don't change any file labels" | 21 | //usage: "\n -n Don't change any file labels" |
21 | //usage: "\n -q Suppress warnings" | 22 | //usage: "\n -q Suppress warnings" |
22 | //usage: "\n -r DIR Use an alternate root path" | 23 | //usage: "\n -r DIR Use an alternate root path" |
@@ -383,16 +384,16 @@ static int restore(const char *file) | |||
383 | * the user has changed but the role and type are the | 384 | * the user has changed but the role and type are the |
384 | * same. For "-vv", emit everything. */ | 385 | * same. For "-vv", emit everything. */ |
385 | if (verbose > 1 || !user_only_changed) { | 386 | if (verbose > 1 || !user_only_changed) { |
386 | bb_info_msg("%s: reset %s context %s->%s", | 387 | printf("%s: reset %s context %s->%s\n", |
387 | applet_name, my_file, context ? context : "", newcon); | 388 | applet_name, my_file, context ? context : "", newcon); |
388 | } | 389 | } |
389 | } | 390 | } |
390 | 391 | ||
391 | if (FLAG_l_take_log && !user_only_changed) { | 392 | if (FLAG_l_take_log && !user_only_changed) { |
392 | if (context) | 393 | if (context) |
393 | bb_info_msg("relabeling %s from %s to %s", my_file, context, newcon); | 394 | printf("relabeling %s from %s to %s\n", my_file, context, newcon); |
394 | else | 395 | else |
395 | bb_info_msg("labeling %s to %s", my_file, newcon); | 396 | printf("labeling %s to %s\n", my_file, newcon); |
396 | } | 397 | } |
397 | 398 | ||
398 | if (outfile && !user_only_changed) | 399 | if (outfile && !user_only_changed) |