summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-10-30 13:33:06 +0200
committerGreg KH <gregkh@suse.de>2005-04-26 22:08:27 -0700
commit091215a59744a2b2d809c5f200e3313266c0d7ce (patch)
treec1c0eda987e47c175c353d28dd4049732e025a92
parent2b0f835ccc67ae3209bc89be22cedfc8341ab5e3 (diff)
[PATCH] Apply the default permissions even if we found a entry in
-rw-r--r--namedev.c7
-rw-r--r--test/udev-test.pl4
2 files changed, 5 insertions, 6 deletions
diff --git a/namedev.c b/namedev.c
index 80d5f1a499..b142dda4fe 100644
--- a/namedev.c
+++ b/namedev.c
@@ -798,11 +798,10 @@ perms:
set_empty_perms(udev, perm->mode,
perm->owner,
perm->group);
- } else {
- set_empty_perms(udev, get_default_mode(),
- get_default_owner(),
- get_default_group());
}
+ set_empty_perms(udev, get_default_mode(),
+ get_default_owner(),
+ get_default_group());
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 2b9fa8a238..e615a1eda8 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -550,11 +550,11 @@ KERNEL="tty2", NAME="tty2"
EOF
},
{
- desc => "permissions tty3:::",
+ desc => "permissions tty3::: (default mode applied)",
subsys => "tty",
devpath => "/class/tty/tty3",
exp_name => "tty3",
- exp_perms => "0:0:0",
+ exp_perms => "0:0:600",
conf => <<EOF
KERNEL="tty3", NAME="tty3"
EOF