chiark / gitweb /
print warning for invalid TEST operations
authorKay Sievers <kay.sievers@vrfy.org>
Wed, 29 Aug 2007 20:19:28 +0000 (22:19 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Wed, 29 Aug 2007 20:19:28 +0000 (22:19 +0200)
udev_rules.c
udev_rules_parse.c

index 364d1b7..ef352ca 100644 (file)
@@ -994,7 +994,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
                }
        }
 
-       if (rule->test.operation != KEY_OP_UNSET) {
+       if (rule->test.operation == KEY_OP_MATCH ||
+           rule->test.operation == KEY_OP_NOMATCH) {
                char filename[PATH_SIZE];
                char devpath[PATH_SIZE];
                char *attr;
index 3afc31a..9e43581 100644 (file)
@@ -469,6 +469,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
                }
 
                if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+                       if (operation != KEY_OP_MATCH &&
+                           operation != KEY_OP_NOMATCH) {
+                               err("invalid TEST operation");
+                               goto invalid;
+                       }
                        attr = get_key_attribute(key + sizeof("TEST")-1);
                        if (attr != NULL)
                                rule->test_mode_mask = strtol(attr, NULL, 8);