aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--selinux/chcon.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c
index 3ddb2dd46..92eb76737 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -131,8 +131,10 @@ static int FAST_FUNC change_filedir_context(
131 bb_error_msg("can't change context of %s to %s", 131 bb_error_msg("can't change context of %s to %s",
132 fname, context_string); 132 fname, context_string);
133 } 133 }
134 } else if (option_mask32 & OPT_VERBOSE) { 134 } else {
135 printf("context of %s retained as %s\n", fname, context_string); 135 if (option_mask32 & OPT_VERBOSE) {
136 printf("context of %s retained as %s\n", fname, context_string);
137 }
136 rc = TRUE; 138 rc = TRUE;
137 } 139 }
138skip: 140skip:
@@ -202,7 +204,7 @@ int chcon_main(int argc UNUSED_PARAM, char **argv)
202 fname[fname_len] = '\0'; 204 fname[fname_len] = '\0';
203 205
204 if (recursive_action(fname, 206 if (recursive_action(fname,
205 1<<option_mask32 & OPT_RECURSIVE, 207 ((option_mask32 & OPT_RECURSIVE) ? ACTION_RECURSIVE : 0),
206 change_filedir_context, 208 change_filedir_context,
207 change_filedir_context, 209 change_filedir_context,
208 NULL, 0) != TRUE) 210 NULL, 0) != TRUE)