diff options
Diffstat (limited to 'selinux')
| -rw-r--r-- | selinux/chcon.c | 4 | ||||
| -rw-r--r-- | selinux/getenforce.c | 4 | ||||
| -rw-r--r-- | selinux/getsebool.c | 2 | ||||
| -rw-r--r-- | selinux/load_policy.c | 2 | ||||
| -rw-r--r-- | selinux/runcon.c | 6 | ||||
| -rw-r--r-- | selinux/sestatus.c | 2 | ||||
| -rw-r--r-- | selinux/setenforce.c | 2 | ||||
| -rw-r--r-- | selinux/setfiles.c | 2 | ||||
| -rw-r--r-- | selinux/setsebool.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c index 5bf91710c..afe7f713d 100644 --- a/selinux/chcon.c +++ b/selinux/chcon.c @@ -107,7 +107,7 @@ static int FAST_FUNC change_filedir_context( context_string = context_str(context); if (!context_string) { - bb_error_msg("can't obtain security context in text expression"); + bb_simple_error_msg("can't obtain security context in text expression"); goto skip; } @@ -194,7 +194,7 @@ int chcon_main(int argc UNUSED_PARAM, char **argv) /* specified_context is never NULL - * "-1" in opt_complementary prevents this. */ if (!argv[0]) - bb_error_msg_and_die("too few arguments"); + bb_simple_error_msg_and_die("too few arguments"); } for (i = 0; (fname = argv[i]) != NULL; i++) { diff --git a/selinux/getenforce.c b/selinux/getenforce.c index 0286dd0be..f082ba614 100644 --- a/selinux/getenforce.c +++ b/selinux/getenforce.c @@ -29,12 +29,12 @@ int getenforce_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) rc = is_selinux_enabled(); if (rc < 0) - bb_error_msg_and_die("is_selinux_enabled() failed"); + bb_simple_error_msg_and_die("is_selinux_enabled() failed"); if (rc == 1) { rc = security_getenforce(); if (rc < 0) - bb_error_msg_and_die("getenforce() failed"); + bb_simple_error_msg_and_die("getenforce() failed"); if (rc) puts("Enforcing"); diff --git a/selinux/getsebool.c b/selinux/getsebool.c index 6d7805c8d..36ddd45b9 100644 --- a/selinux/getsebool.c +++ b/selinux/getsebool.c @@ -40,7 +40,7 @@ int getsebool_main(int argc, char **argv) rc = security_get_boolean_names(&names, &len); if (rc) - bb_perror_msg_and_die("can't get boolean names"); + bb_simple_perror_msg_and_die("can't get boolean names"); if (!len) { puts("No booleans"); diff --git a/selinux/load_policy.c b/selinux/load_policy.c index b7930839c..eac6ba6c1 100644 --- a/selinux/load_policy.c +++ b/selinux/load_policy.c @@ -31,7 +31,7 @@ int load_policy_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) rc = selinux_mkload_policy(1); if (rc < 0) { - bb_perror_msg_and_die("can't load policy"); + bb_simple_perror_msg_and_die("can't load policy"); } return 0; diff --git a/selinux/runcon.c b/selinux/runcon.c index a5a394427..bc4fa23e0 100644 --- a/selinux/runcon.c +++ b/selinux/runcon.c @@ -65,7 +65,7 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type, security_context_t cur_context; if (getcon(&cur_context)) - bb_error_msg_and_die("can't get current context"); + bb_simple_error_msg_and_die("can't get current context"); if (compute_trans) { security_context_t file_context, new_context; @@ -75,7 +75,7 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type, command); if (security_compute_create(cur_context, file_context, SECCLASS_PROCESS, &new_context)) - bb_error_msg_and_die("unable to compute a new context"); + bb_simple_error_msg_and_die("unable to compute a new context"); cur_context = new_context; } @@ -137,7 +137,7 @@ int runcon_main(int argc UNUSED_PARAM, char **argv) if (!(opts & OPTS_CONTEXT_COMPONENT)) { context = *argv++; if (!argv[0]) - bb_error_msg_and_die("no command given"); + bb_simple_error_msg_and_die("no command given"); } if (context) { diff --git a/selinux/sestatus.c b/selinux/sestatus.c index 6954aca70..098a4d189 100644 --- a/selinux/sestatus.c +++ b/selinux/sestatus.c @@ -216,5 +216,5 @@ int sestatus_main(int argc UNUSED_PARAM, char **argv) return 0; error: - bb_perror_msg_and_die("libselinux returns unknown state"); + bb_simple_perror_msg_and_die("libselinux returns unknown state"); } diff --git a/selinux/setenforce.c b/selinux/setenforce.c index c28de6ec5..996034f8e 100644 --- a/selinux/setenforce.c +++ b/selinux/setenforce.c @@ -49,7 +49,7 @@ int setenforce_main(int argc UNUSED_PARAM, char **argv) continue; rc = security_setenforce(i & 1); if (rc < 0) - bb_perror_msg_and_die("setenforce() failed"); + bb_simple_perror_msg_and_die("setenforce() failed"); return 0; } diff --git a/selinux/setfiles.c b/selinux/setfiles.c index 740eaf8fb..55bfb4d02 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c @@ -182,7 +182,7 @@ static void inc_err(void) { nerr++; if (nerr > 9 && !FLAG_d_debug) { - bb_error_msg_and_die("exiting after 10 errors"); + bb_simple_error_msg_and_die("exiting after 10 errors"); } } diff --git a/selinux/setsebool.c b/selinux/setsebool.c index 579118172..2af23acd7 100644 --- a/selinux/setsebool.c +++ b/selinux/setsebool.c @@ -46,7 +46,7 @@ int setsebool_main(int argc, char **argv) } if (security_set_boolean(argv[1], value) < 0) - bb_error_msg_and_die("can't set boolean"); + bb_simple_error_msg_and_die("can't set boolean"); return 0; } |