From: kay.sievers@vrfy.org Date: Tue, 7 Dec 2004 21:38:40 +0000 (+0100) Subject: [PATCH] restore OWNER/GROUP assignment in rule coming from RESULT X-Git-Tag: 047~13 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=0ba5bb106b19d808c2e68af4ff34740854f78290 [PATCH] restore OWNER/GROUP assignment in rule coming from RESULT --- diff --git a/namedev.c b/namedev.c index 7045637e7..9cfc4283b 100644 --- a/namedev.c +++ b/namedev.c @@ -665,8 +665,7 @@ static int match_rule(struct udevice *udev, struct config_device *dev, /* check for matching result of external program */ if (dev->result[0] != '\0') { - dbg("check for " FIELD_RESULT - " dev->result='%s', udev->program_result='%s'", + dbg("check for " FIELD_RESULT " dev->result='%s', udev->program_result='%s'", dev->result, udev->program_result); if (strcmp_pattern(dev->result, udev->program_result) != 0) { dbg(FIELD_RESULT " is not matching"); @@ -777,7 +776,9 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d udev->partitions = dev->partitions; udev->mode = dev->mode; strfieldcpy(udev->owner, dev->owner); + apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device); strfieldcpy(udev->group, dev->group); + apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device); goto perms; }