diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-23 16:25:17 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-23 16:25:17 +0100 |
| commit | 651a2697f725f10c1ebdb8947925b5a9c6cf4fe2 (patch) | |
| tree | e2373083cc4bf57af9c114c311ff089b84835f0f /selinux | |
| parent | 37a658c4c86fa5ad9fb6f76cba2fca80f4249036 (diff) | |
| download | busybox-651a2697f725f10c1ebdb8947925b5a9c6cf4fe2.tar.gz | |
*: merge some common strings
text data bss dec hexfilename
838650 8009 0 846659 ceb43busybox_old
838519 8009 0 846528 ceac0busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'selinux')
| -rw-r--r-- | selinux/chcon.c | 4 | ||||
| -rw-r--r-- | selinux/runcon.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c index 4395a7ee4..c6be37f44 100644 --- a/selinux/chcon.c +++ b/selinux/chcon.c @@ -90,13 +90,13 @@ static int FAST_FUNC change_filedir_context( if ((option_mask32 & OPT_VERBOSE) || ((option_mask32 & OPT_CHANHES) && !fail)) { printf(!fail ? "context of %s changed to %s\n" - : "failed to change context of %s to %s\n", + : "can't change context of %s to %s\n", fname, context_string); } if (!fail) { rc = TRUE; } else if ((option_mask32 & OPT_QUIET) == 0) { - bb_error_msg("failed to change context of %s to %s", + bb_error_msg("can't change context of %s to %s", fname, context_string); } } else if (option_mask32 & OPT_VERBOSE) { diff --git a/selinux/runcon.c b/selinux/runcon.c index 8472b7090..4afd1116e 100644 --- a/selinux/runcon.c +++ b/selinux/runcon.c @@ -59,13 +59,13 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type, if (!con) bb_error_msg_and_die("'%s' is not a valid context", cur_context); if (user && context_user_set(con, user)) - bb_error_msg_and_die("failed to set new user '%s'", user); + bb_error_msg_and_die("can't set new user '%s'", user); if (type && context_type_set(con, type)) - bb_error_msg_and_die("failed to set new type '%s'", type); + bb_error_msg_and_die("can't set new type '%s'", type); if (range && context_range_set(con, range)) - bb_error_msg_and_die("failed to set new range '%s'", range); + bb_error_msg_and_die("can't set new range '%s'", range); if (role && context_role_set(con, role)) - bb_error_msg_and_die("failed to set new role '%s'", role); + bb_error_msg_and_die("can't set new role '%s'", role); return con; } |