am 7e9fe7d8: Merge "builtins: remove setenforce command"

* commit '7e9fe7d86de665bcb2615d8c24de39416c48cdec':
  builtins: remove setenforce command
This commit is contained in:
Nick Kralevich 2015-03-12 01:04:39 +00:00 committed by Android Git Automerger
commit 0d6fca8a4f
4 changed files with 0 additions and 16 deletions

View File

@ -571,15 +571,6 @@ int do_setcon(int nargs, char **args) {
return 0;
}
int do_setenforce(int nargs, char **args) {
if (is_selinux_enabled() <= 0)
return 0;
if (security_setenforce(atoi(args[1])) < 0) {
return -errno;
}
return 0;
}
int do_setkey(int nargs, char **args)
{
struct kbentry kbe;

View File

@ -186,7 +186,6 @@ static int lookup_keyword(const char *s)
if (!strcmp(s, "eclabel")) return K_seclabel;
if (!strcmp(s, "ervice")) return K_service;
if (!strcmp(s, "etcon")) return K_setcon;
if (!strcmp(s, "etenforce")) return K_setenforce;
if (!strcmp(s, "etenv")) return K_setenv;
if (!strcmp(s, "etkey")) return K_setkey;
if (!strcmp(s, "etprop")) return K_setprop;

View File

@ -23,7 +23,6 @@ int do_restorecon_recursive(int nargs, char **args);
int do_rm(int nargs, char **args);
int do_rmdir(int nargs, char **args);
int do_setcon(int nargs, char **args);
int do_setenforce(int nargs, char **args);
int do_setkey(int nargs, char **args);
int do_setprop(int nargs, char **args);
int do_setrlimit(int nargs, char **args);
@ -84,7 +83,6 @@ enum {
KEYWORD(seclabel, OPTION, 0, 0)
KEYWORD(service, SECTION, 0, 0)
KEYWORD(setcon, COMMAND, 1, do_setcon)
KEYWORD(setenforce, COMMAND, 1, do_setenforce)
KEYWORD(setenv, OPTION, 2, 0)
KEYWORD(setkey, COMMAND, 0, do_setkey)
KEYWORD(setprop, COMMAND, 2, do_setprop)

View File

@ -228,10 +228,6 @@ setcon <seclabel>
This is typically only used from early-init to set the init context
before any other process is started.
setenforce 0|1
Set the SELinux system-wide enforcing status.
0 is permissive (i.e. log but do not deny), 1 is enforcing.
setkey
TBD