]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shared/verbs: drop now-unused VERB_MUST_BE_ROOT
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 8 May 2019 09:33:02 +0000 (11:33 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 8 May 2019 09:51:51 +0000 (11:51 +0200)
src/shared/verbs.c
src/shared/verbs.h

index 7c5dcb02a245d7dba3cbebc9f51783dbb80dd344..c87b496736e6caf88ca9c5e0d54da612e27fde9b 100644 (file)
@@ -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 {
index 010c0df3fdc97f7d05bc9d9f8030e8cd34319be7..c5fe6cc7c58b75c5065d96734b139ae2c76a4b2c 100644 (file)
@@ -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 {