From b022b8428c98ec41224813070d5561258a46495a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 1 Apr 2015 10:20:52 -0700 Subject: [PATCH] Remove no-op "capabilities". This never worked, and implementing it would just be an attempt to cling to the pre-SELinux past. Change-Id: Iecba2affa50ee49ccf62677a607bfae95cb0aaf7 --- init/init_parser.cpp | 3 --- init/keywords.h | 1 - 2 files changed, 4 deletions(-) diff --git a/init/init_parser.cpp b/init/init_parser.cpp index 294dc19e4..5d310174b 100644 --- a/init/init_parser.cpp +++ b/init/init_parser.cpp @@ -122,7 +122,6 @@ static int lookup_keyword(const char *s) break; case 'c': if (!strcmp(s, "opy")) return K_copy; - if (!strcmp(s, "apability")) return K_capability; if (!strcmp(s, "lass")) return K_class; if (!strcmp(s, "lass_start")) return K_class_start; if (!strcmp(s, "lass_stop")) return K_class_stop; @@ -775,8 +774,6 @@ static void parse_line_service(struct parse_state *state, int nargs, char **args kw = lookup_keyword(args[0]); switch (kw) { - case K_capability: - break; case K_class: if (nargs != 2) { parse_error(state, "class option requires a classname\n"); diff --git a/init/keywords.h b/init/keywords.h index 09f645b80..424637758 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -44,7 +44,6 @@ int do_wait(int nargs, char **args); enum { K_UNKNOWN, #endif - KEYWORD(capability, OPTION, 0, 0) KEYWORD(class, OPTION, 0, 0) KEYWORD(class_start, COMMAND, 1, do_class_start) KEYWORD(class_stop, COMMAND, 1, do_class_stop)