Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b022b842 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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
parent a58c0b5f

init/init_parser.cpp

+0 −3
Original line number Diff line number Diff line
@@ -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");

init/keywords.h

+0 −1
Original line number Diff line number Diff line
@@ -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)