SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

verbs: add a new VERB_MUSTBEROOT flag

Browse Source 
Given that we regularly have verbs that require privileges, let's just
make this a flag of the verb.
This commit is contained in:
Lennart Poettering
2017-12-11 23:19:46 +01:00
parent fba868fa71
commit 0c63eb7138
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl.c
+1 -5
View File
@@ -2074,10 +2074,6 @@ static int list_machines(int argc, char *argv[], void *userdata) {
sd_bus *bus;
int r;
r = must_be_root();
if (r < 0)
return r;
r = acquire_bus(BUS_MANAGER, &bus);
if (r < 0)
return r;
@@ -8408,7 +8404,7 @@ static int systemctl_main(int argc, char *argv[]) {
{ "list-sockets", VERB_ANY, VERB_ANY, VERB_NOCHROOT, list_sockets },
{ "list-timers", VERB_ANY, VERB_ANY, VERB_NOCHROOT, list_timers },
{ "list-jobs", VERB_ANY, VERB_ANY, VERB_NOCHROOT, list_jobs },
{ "list-machines", VERB_ANY, VERB_ANY, VERB_NOCHROOT, list_machines },
{ "list-machines", VERB_ANY, VERB_ANY, VERB_NOCHROOT|VERB_MUSTBEROOT, list_machines },
{ "clear-jobs", VERB_ANY, 1, VERB_NOCHROOT, trivial_method },
{ "cancel", VERB_ANY, VERB_ANY, VERB_NOCHROOT, cancel_job },
{ "start", 2, VERB_ANY, VERB_NOCHROOT, start_unit },