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

Commit dc2769d1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 8c09e148: am 0f6286d7: Merge "Remove getsebool/setsebool from init and toolbox." 

* commit '8c09e148':
  Remove getsebool/setsebool from init and toolbox.
parents b5662f93 8c09e148

init/builtins.cpp

+0 −28
Original line number Diff line number Diff line
@@ -854,34 +854,6 @@ int do_restorecon_recursive(int nargs, char **args) { 
    return ret;

}



int do_setsebool(int nargs, char **args) {

    const char *name = args[1];

    const char *value = args[2];

    SELboolean b;

    int ret;



    if (is_selinux_enabled() <= 0)

        return 0;



    b.name = name;

    if (!strcmp(value, "1") || !strcasecmp(value, "true") || !strcasecmp(value, "on"))

        b.value = 1;

    else if (!strcmp(value, "0") || !strcasecmp(value, "false") || !strcasecmp(value, "off"))

        b.value = 0;

    else {

        ERROR("setsebool: invalid value %s\n", value);

        return -EINVAL;

    }



    if (security_set_boolean_list(1, &b, 0) < 0) {

        ret = -errno;

        ERROR("setsebool: could not set %s to %s\n", name, value);

        return ret;

    }



    return 0;

}



int do_loglevel(int nargs, char **args) {

    int log_level;

    char log_level_str[PROP_VALUE_MAX] = "";

init/init_parser.cpp

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ static int lookup_keyword(const char *s) 
        if (!strcmp(s, "etkey")) return K_setkey;

        if (!strcmp(s, "etprop")) return K_setprop;

        if (!strcmp(s, "etrlimit")) return K_setrlimit;

        if (!strcmp(s, "etsebool")) return K_setsebool;

        if (!strcmp(s, "ocket")) return K_socket;

        if (!strcmp(s, "tart")) return K_start;

        if (!strcmp(s, "top")) return K_stop;

init/keywords.h

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ int do_setcon(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);

int do_setsebool(int nargs, char **args);

int do_start(int nargs, char **args);

int do_stop(int nargs, char **args);

int do_swapon_all(int nargs, char **args);
@@ -87,7 +86,6 @@ enum { 
    KEYWORD(setkey,      COMMAND, 0, do_setkey)

    KEYWORD(setprop,     COMMAND, 2, do_setprop)

    KEYWORD(setrlimit,   COMMAND, 3, do_setrlimit)

    KEYWORD(setsebool,   COMMAND, 2, do_setsebool)

    KEYWORD(socket,      OPTION,  0, 0)

    KEYWORD(start,       COMMAND, 1, do_start)

    KEYWORD(stop,        COMMAND, 1, do_stop)

init/readme.txt

+0 −4
Original line number Diff line number Diff line
@@ -238,10 +238,6 @@ setprop <name> <value> 
setrlimit <resource> <cur> <max>

   Set the rlimit for a resource.



setsebool <name> <value>

   Set SELinux boolean <name> to <value>.

   <value> may be 1|true|on or 0|false|off



start <service>

   Start a service running if it is not already running.

toolbox/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ OUR_TOOLS := \ 
    df \

    getevent \

    getprop \

    getsebool \

    iftop \

    ioctl \

    ionice \
@@ -64,7 +63,6 @@ OUR_TOOLS := \ 
    schedtop \

    sendevent \

    setprop \

    setsebool \

    smd \

    start \

    stop \