[PATCH] Apply the default permissions even if we found a entry in

diff --git a/namedev.c b/namedev.c
index 80d5f1a499be4c631c5bf6c9f80ce5d441bd70af..b142dda4fe4d18872f5ff1af70483cb0b07a5805 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -798,11 +798,10 @@ perms:
                set_empty_perms(udev, perm->mode,
                                      perm->owner,
                                      perm->group);
                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);
 
        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 2b9fa8a2380433e42a1f70f88a9c11cf3384ea89..e615a1eda82675879c154a0f0ad412a03a6d818b 100644 (file)
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -550,11 +550,11 @@ KERNEL="tty2", NAME="tty2"
 EOF
        },
        {
 EOF
        },
        {

-               desc            => "permissions tty3:::",
+               desc            => "permissions tty3::: (default mode applied)",

                subsys          => "tty",
                devpath         => "/class/tty/tty3",
                exp_name        => "tty3",
                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
                conf            => <<EOF
 KERNEL="tty3", NAME="tty3"
 EOF