From 7b15ac99f3bfef33c82ea109487c99a77b41ebfb Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 23 Apr 2015 20:54:46 -0700 Subject: [PATCH] Remove now-unusable 'setcon' command. Bug: http://b/19702273 Change-Id: Icd340c80ba074476dcc63f1c1dd5c61a5c768893 --- init/builtins.cpp | 9 --------- init/init_parser.cpp | 1 - init/keywords.h | 2 -- init/readme.txt | 5 ----- 4 files changed, 17 deletions(-) diff --git a/init/builtins.cpp b/init/builtins.cpp index 3bbaf8336..4567b04b4 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -515,15 +515,6 @@ int do_swapon_all(int nargs, char **args) return ret; } -int do_setcon(int nargs, char **args) { - if (is_selinux_enabled() <= 0) - return 0; - if (setcon(args[1]) < 0) { - return -errno; - } - return 0; -} - int do_setprop(int nargs, char **args) { const char *name = args[1]; diff --git a/init/init_parser.cpp b/init/init_parser.cpp index ff31093cb..b76b04ee5 100644 --- a/init/init_parser.cpp +++ b/init/init_parser.cpp @@ -184,7 +184,6 @@ static int lookup_keyword(const char *s) case '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, "etenv")) return K_setenv; if (!strcmp(s, "etprop")) return K_setprop; if (!strcmp(s, "etrlimit")) return K_setrlimit; diff --git a/init/keywords.h b/init/keywords.h index 059dde126..37f01b861 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -20,7 +20,6 @@ int do_restorecon(int nargs, char **args); 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_setprop(int nargs, char **args); int do_setrlimit(int nargs, char **args); int do_start(int nargs, char **args); @@ -76,7 +75,6 @@ enum { KEYWORD(rmdir, COMMAND, 1, do_rmdir) KEYWORD(seclabel, OPTION, 0, 0) KEYWORD(service, SECTION, 0, 0) - KEYWORD(setcon, COMMAND, 1, do_setcon) KEYWORD(setenv, OPTION, 2, 0) KEYWORD(setprop, COMMAND, 2, do_setprop) KEYWORD(setrlimit, COMMAND, 3, do_setrlimit) diff --git a/init/readme.txt b/init/readme.txt index 84afd11d8..6b9c42d3f 100644 --- a/init/readme.txt +++ b/init/readme.txt @@ -252,11 +252,6 @@ rm rmdir Calls rmdir(2) on the given path. -setcon - Set the current process security context to the specified string. - This is typically only used from early-init to set the init context - before any other process is started. - setprop Set system property to . Properties are expanded within .