udev-acl: use a tag instead of a property to mark devices

[elogind.git] / extras / udev-acl / udev-acl.c

diff --git a/extras/udev-acl/udev-acl.c b/extras/udev-acl/udev-acl.c
index c070fccd17a6b45efd750cf720950497d809af19..ff04ec6bed8543d38c352b1c48e3a276b0802f07 100644 (file)
--- a/extras/udev-acl/udev-acl.c
+++ b/extras/udev-acl/udev-acl.c
@@ -289,7 +289,7 @@ static void apply_acl_to_devices(uid_t uid, int add)
        /* iterate over all devices tagged with ACL_SET */
        udev = udev_new();
        enumerate = udev_enumerate_new(udev);
-       udev_enumerate_add_match_property(enumerate, "ACL_MANAGE", "1");
+       udev_enumerate_add_match_tag(enumerate, "udev-acl");
        udev_enumerate_scan_devices(enumerate);
        udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
                struct udev_device *device;
@@ -353,12 +353,10 @@ int main (int argc, char* argv[])
 
                switch (option) {
                case 'a':
-                       if (strcmp(optarg, "add") == 0 || strcmp(optarg, "change") == 0)
-                               action = ACTION_ADD;
-                       else if (strcmp(optarg, "remove") == 0)
+                       if (strcmp(optarg, "remove") == 0)
                                action = ACTION_REMOVE;
                        else
-                               goto out;
+                               action = ACTION_ADD;
                        break;
                case 'D':
                        device = optarg;