diff options
| author | Scott James Remnant <scott@ubuntu.com> | 2009-05-14 12:42:44 +0100 |
|---|---|---|
| committer | Scott James Remnant <scott@ubuntu.com> | 2009-05-14 12:42:44 +0100 |
| commit | 055e40edc647d8ccfc27c9cd3163ab5dbf63ed6c (patch) | |
| tree | 29a21bc48d9a89bcebbf12e2c7798c0db71496b1 | |
| parent | b4fa1b67f86c9555cbb41c57774761730f6b8939 (diff) | |
OWNER/GROUP: fix if logic
The introduction of the --resolve-names=early/never code introduced a
bug to the OWNER/GROUP lookup. Previously if the name had contained $,
lookup would have been performed later; after the patch, the key ended
up being ignored!
| -rw-r--r-- | udev/udev-rules.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/udev/udev-rules.c b/udev/udev-rules.c index b8b7e52c83..39fe55aac1 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -1431,7 +1431,7 @@ static int add_rule(struct udev_rules *rules, char *line, } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) { uid = add_uid(rules, value); rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid); - } else if (rules->resolve_names == 0) { + } else if (rules->resolve_names >= 0) { rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL); } rule_tmp.rule.rule.flags = 1; @@ -1448,7 +1448,7 @@ static int add_rule(struct udev_rules *rules, char *line, } else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) { gid = add_gid(rules, value); rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid); - } else if (rules->resolve_names == 0) { + } else if (rules->resolve_names >= 0) { rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL); } rule_tmp.rule.rule.flags = 1; |