From: Kay Sievers <kay.sievers@suse.de>
Date: Thu, 7 Jul 2005 20:40:09 +0000 (+0200)
Subject: fix typo in group assignment
X-Git-Tag: 062~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a72e3f666b897f94a64547ace3af74785d2f6771

fix typo in group assignment

Thanks to: Georgi Georgiev
---

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 521047147..6fbc23e55 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"
@@ -1415,6 +1416,29 @@ KERNEL=="ttyUSB[0-9]*", SYMLINK+="one"
 KERNEL=="ttyUSB[0-9]*", SYMLINK+="two"
 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
 	},
 );
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 0021ec40b..a2f2f1804 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;
 				}
 			}