From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Sat, 30 Oct 2004 11:33:06 +0000 (+0200)
Subject: [PATCH] Apply the default permissions even if we found a entry in
X-Git-Tag: 043~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=091215a59744a2b2d809c5f200e3313266c0d7ce;p=systemd

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

diff --git a/namedev.c b/namedev.c
index 80d5f1a4..b142dda4 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 2b9fa8a2..e615a1ed 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