summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-05-08 11:33:02 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-05-08 11:51:51 +0200
commit62bf89d7d2118d197c6c932c86012e72497c6d24 (patch)
tree0ce306df57a08034165cf05dd6d1f410fe2420a4
parenta004cb75c0a0ae085ebc9b470afba68375a53507 (diff)
downloadsystemd-62bf89d7d2118d197c6c932c86012e72497c6d24.tar.gz
shared/verbs: drop now-unused VERB_MUST_BE_ROOT
-rw-r--r--src/shared/verbs.c8
-rw-r--r--src/shared/verbs.h1
2 files changed, 1 insertions, 8 deletions
diff --git a/src/shared/verbs.c b/src/shared/verbs.c
index 7c5dcb02a2..c87b496736 100644
--- a/src/shared/verbs.c
+++ b/src/shared/verbs.c
@@ -50,7 +50,7 @@ int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata) {
const Verb *verb;
const char *name;
unsigned i;
- int left, r;
+ int left;
assert(verbs);
assert(verbs[0].dispatch);
@@ -109,12 +109,6 @@ int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata) {
return 0;
}
- if (verb->flags & VERB_MUST_BE_ROOT) {
- r = must_be_root();
- if (r < 0)
- return r;
- }
-
if (name)
return verb->dispatch(left, argv, userdata);
else {
diff --git a/src/shared/verbs.h b/src/shared/verbs.h
index 010c0df3fd..c5fe6cc7c5 100644
--- a/src/shared/verbs.h
+++ b/src/shared/verbs.h
@@ -8,7 +8,6 @@
typedef enum VerbFlags {
VERB_DEFAULT = 1 << 0,
VERB_ONLINE_ONLY = 1 << 1,
- VERB_MUST_BE_ROOT = 1 << 2,
} VerbFlags;
typedef struct {