Re: [PATCH] allow to specify node permissions in the rule

[Kay Sievers <kay.sievers@vrfy.org>]

[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]

On Wed, Mar 10, 2004 at 02:41:19PM -0800, Greg KH wrote:
> On Sun, Mar 07, 2004 at 02:12:23AM +0100, Kay Sievers wrote:
> > This allows to set the permissions along with the rule.
> > 
> > This is not a general replacement for the permissions config, but it
> > may be easier sometimes for the user to specify the permissions along
> > with the rule, cause the permissions config file wants the final node
> > name to match, which seems sometimes a bit difficult to guess, if
> > format % chars are used in the NAME field.
> > 
> > Any value not given in the rule is still be read from the permissions
> > file or set to the default. This one will also work:
> > 
> >   BUS="usb", KERNEL="video*", NAME="my-%k", OWNER="$local"
> > 
> > A few words to man page are also added and add_perm_dev() is moved into
> > namedev_parse.c where it belongs to.
> 
> Hm, as enough people have asked for something like this, I've applied
> it.
> 
> Any chance on being able to add a test for this kind of stuff to the
> udev-test.pl script?

Sure, not brilliant but seems to work :)
Only numeric id's are supported so far.

Kay

[-- Attachment #2: 01-permissions-test.patch --]
[-- Type: text/plain, Size: 1354 bytes --]

===== test/udev-test.pl 1.45 vs edited =====
--- 1.45/test/udev-test.pl	Thu Mar 11 01:36:18 2004
+++ edited/test/udev-test.pl	Thu Mar 11 03:14:35 2004
@@ -524,6 +524,16 @@
 BUS="scsi", KERNEL="sda", NAME="link", SYMLINK="symlink0"
 EOF
 	},
+	{
+		desc     => "permissions test",
+		subsys   => "block",
+		devpath  => "block/sda",
+		expected => "node",
+		perms    => "5000::0444",
+		conf     => <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", MODE="0444"
+EOF
+	},
 );
 
 # set env
@@ -556,6 +566,26 @@
 
 	udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf});
 	if (-e "$PWD/$udev_root$config->{expected}") {
+		if (defined($config->{perms})) {
+			my $wrong = 0;
+			my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
+			    $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$config->{expected}");
+
+			$config->{perms} =~ m/^(.*):(.*):(.*)$/;
+			if ($1 ne "") {
+				if ($uid != $1) { $wrong = 1; };
+			}
+			if ($2 ne "") {
+				if ($gid != $2) { $wrong = 1; };
+			}
+			if ($3 ne "") {
+				if (($mode & 07777) != oct($3)) { $wrong = 1; };
+			}
+			if ($wrong == 1) {
+				printf "expected permissions are: %i:%i:%#o\n", $1, $2, oct($3);
+				printf "created permissions are : %i:%i:%#o\n", $uid, $gid, $mode & 07777;
+			}
+		}
 		print "add: ok    ";
 	} else {
 		print "add: error\n";