X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-rules.c;h=56a258d8adb920638ccd511f4ec5b1579f697215;hb=cbdb9c39f611c8ce410cf8da5db21eb3dfb10b34;hp=a77e1e223f1406172cc91900e8a552eabc5a1eba;hpb=7df0ed83c113e4744786e7804d398d9d34b43281;p=elogind.git

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index a77e1e223..56a258d8a 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -2526,11 +2526,15 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			}
 			break;
 		}
-		case TK_A_TAG:
+		case TK_A_TAG: {
+			char tag[UTIL_PATH_SIZE];
+
+			udev_event_apply_format(event, &rules->buf[cur->key.value_off], tag, sizeof(tag));
 			if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
 				udev_device_cleanup_tags_list(event->dev);
-			udev_device_add_tag(event->dev, &rules->buf[cur->key.value_off]);
+			udev_device_add_tag(event->dev, tag);
 			break;
+		}
 		case TK_A_NAME: {
 			const char *name  = &rules->buf[cur->key.value_off];
 			char name_str[UTIL_PATH_SIZE];
@@ -2705,8 +2709,9 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
 		case TK_A_STATIC_NODE: {
 			char filename[UTIL_PATH_SIZE];
 			struct stat stats;
+
 			/* we assure, that the permissions tokens are sorted before the static token */
-			if (mode == 0 && uid == 0 && gid == 0)
+			if (uid == 0 && gid == 0)
 				goto next;
 			util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/",
 				      &rules->buf[cur->key.value_off], NULL);
@@ -2714,14 +2719,19 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
 				goto next;
 			if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode))
 				goto next;
-			if (mode != 0 && mode != (stats.st_mode & 0777)) {
+
+			if (mode == 0 && gid > 0)
+				mode = 0660;
+			if (mode != (stats.st_mode & 0777)) {
 				chmod(filename, mode);
 				info(rules->udev, "chmod '%s' %#o\n", filename, mode);
 			}
+
 			if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) {
 				chown(filename, uid, gid);
 				info(rules->udev, "chown '%s' %u %u\n", filename, uid, gid);
 			}
+
 			utimensat(AT_FDCWD, filename, NULL, 0);
 			break;
 		}