picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rules: static_node - use 0660 if group is given to get the cigar

Browse source 
>> On Tue, May 24, 2011 at 15:33, Tom Gundersen <teg@jklm.no> wrote:
>
> Close, but no cigar. Looks like the static nodes are not assigned
> permissions 0660 even if a gid is set (the nodes have perms 0600).
>
> Cheers,
>
> Tom
This commit is contained in:
Kay Sievers 2011-05-30 02:12:02 +02:00
parent ea69e8217b
commit c112873b5b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
udev/udev-rules.c
View file

@ -2709,8 +2709,9 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
case TK_A_STATIC_NODE: { case TK_A_STATIC_NODE: {
char filename[UTIL_PATH_SIZE]; char filename[UTIL_PATH_SIZE];
struct stat stats; struct stat stats;
/* we assure, that the permissions tokens are sorted before the static token */ /* 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; goto next;
util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/", util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/",
&rules->buf[cur->key.value_off], NULL); &rules->buf[cur->key.value_off], NULL);
@ -2718,14 +2719,19 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
goto next; goto next;
if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode)) if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode))
goto next; 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); chmod(filename, mode);
info(rules->udev, "chmod '%s' %#o\n", filename, mode); info(rules->udev, "chmod '%s' %#o\n", filename, mode);
} }
if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) { if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) {
chown(filename, uid, gid); chown(filename, uid, gid);
info(rules->udev, "chown '%s' %u %u\n", filename, uid, gid); info(rules->udev, "chown '%s' %u %u\n", filename, uid, gid);
} }
utimensat(AT_FDCWD, filename, NULL, 0); utimensat(AT_FDCWD, filename, NULL, 0);
break; break;
} }