RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

setsebool does not do a good job of reporting missing booleans. 

This patch will clearly tell the user that he tried to set a boolean that does not exist.
This commit is contained in:
Dan Walsh 2013-10-11 10:24:48 -04:00 committed by Stephen Smalley
parent 1fd22fc498
commit 62c0cd6194
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
policycoreutils/setsebool/setsebool.c
View File

@ -10,6 +10,8 @@
#include <pwd.h>
#include <selinux/selinux.h>
#include <semanage/handle.h>
#include <semanage/debug.h>
#include <semanage/booleans_policy.h>
#include <semanage/booleans_local.h>
#include <semanage/booleans_active.h>
#include <semanage/boolean_record.h>
@ -127,6 +129,7 @@ static int semanage_set_boolean_list(size_t boolcnt,
semanage_bool_t *boolean = NULL;
semanage_bool_key_t *bool_key = NULL;
int managed;
int result;
handle = semanage_handle_create();
if (handle == NULL) {
@ -175,12 +178,21 @@ static int semanage_set_boolean_list(size_t boolcnt,
if (semanage_bool_key_extract(handle, boolean, &bool_key) < 0)
goto err;
semanage_bool_exists(handle, bool_key, &result);
if ( !result ) {
semanage_bool_exists_local(handle, bool_key, &result);
if ( !result ) {
fprintf(stderr, "Boolean %s is not defined\n", boollist[j].name);
goto err;
}
}
if (semanage_bool_modify_local(handle, bool_key,
boolean) < 0)
goto err;
if (semanage_bool_set_active(handle, bool_key, boolean) < 0) {
fprintf(stderr, "Could not change boolean %s\n",
fprintf(stderr, "Failed to change boolean %s: %m\n",
boollist[j].name);
goto err;
}
@ -202,7 +214,6 @@ static int semanage_set_boolean_list(size_t boolcnt,
semanage_bool_key_free(bool_key);
semanage_bool_free(boolean);
semanage_handle_destroy(handle);
fprintf(stderr, "Could not change policy booleans\n");
return -1;
}