summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2005-07-07 22:40:09 +0200
committerKay Sievers <kay.sievers@suse.de>2005-07-07 22:40:09 +0200
commita72e3f666b897f94a64547ace3af74785d2f6771 (patch)
treecd085006d4c390bf7ef0519bc0c2cc20a7b2cd9e
parent613ffbeb15e0507581e5037850c1ea5d56cd0928 (diff)
fix typo in group assignment
Thanks to: Georgi Georgiev
-rwxr-xr-xtest/udev-test.pl26
-rw-r--r--udev_rules_parse.c2
2 files changed, 26 insertions, 2 deletions
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 5210471474..6fbc23e557 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1090,7 +1090,8 @@ EOF
desc => "ignore rule test",
subsys => "block",
devpath => "/block/sda",
- exp_name => "node",
+ exp_name => "nothing",
+ not_exp_name => "node",
exp_add_error => "yes",
rules => <<EOF
BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore"
@@ -1417,6 +1418,29 @@ KERNEL=="ttyUSB[0-9]*", SYMLINK="three"
KERNEL=="ttyUSB[0-9]*", NAME="node"
EOF
},
+ {
+ desc => "test empty NAME",
+ subsys => "tty",
+ devpath => "/class/tty/ttyUSB0",
+ exp_name => "node",
+ not_exp_name => "wrong",
+ exp_add_error => "yes",
+ rules => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME=""
+KERNEL=="ttyUSB[0-9]*", NAME="wrong"
+EOF
+ },
+ {
+ desc => "test empty NAME 2",
+ subsys => "tty",
+ devpath => "/class/tty/ttyUSB0",
+ exp_name => "right",
+ rules => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="right"
+KERNEL=="ttyUSB[0-9]*", NAME=""
+KERNEL=="ttyUSB[0-9]*", NAME="wrong"
+EOF
+ },
);
# set env
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 0021ec40be..a2f2f1804b 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -409,7 +409,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
gid_t gid = lookup_group(value);
dbg("replacing groupname='%s' by id=%i", value, gid);
sprintf(group, "%li", gid);
- add_rule_key(rule, &rule->owner, operation, group);
+ add_rule_key(rule, &rule->group, operation, group);
continue;
}
}