Attachment 301767 Details for Bug 441054 – better patch

[patch] better patch

udev-095-slink.patch (text/plain), 1.76 KB, created by Harald Hoyer on 2008-04-09 10:02:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Hoyer

Created: 2008-04-09 10:02:06 UTC

Size: 1.76 KB

patch

obsolete

>diff -up udev-095/udev_selinux.c.slink udev-095/udev_selinux.c
>--- udev-095/udev_selinux.c.slink	2008-04-09 11:44:47.000000000 +0200
>+++ udev-095/udev_selinux.c	2008-04-09 11:51:28.000000000 +0200
>@@ -85,6 +85,7 @@ out:
> 	return media;
> }
> 
>+
> void selinux_setfilecon(const char *file, const char *devname, unsigned int mode)
> {
> 	if (is_selinux_running()) {
>@@ -104,8 +105,14 @@ void selinux_setfilecon(const char *file
> 				return;
> 			} 
> 
>-		if (setfilecon(file, scontext) < 0)
>-			err("setfilecon %s failed: %s", file, strerror(errno));
>+		if (mode == S_IFLNK) {
>+			if (lsetfilecon(file, scontext) < 0)
>+				err("lsetfilecon %s failed: %s", file, strerror(errno));
>+		}
>+		else {
>+			if (setfilecon(file, scontext) < 0)
>+				err("setfilecon %s failed: %s", file, strerror(errno));
>+		}
> 
> 		freecon(scontext);
> 	}
>diff -up udev-095/udev_node.c.slink udev-095/udev_node.c
>--- udev-095/udev_node.c.slink	2008-04-09 11:44:25.000000000 +0200
>+++ udev-095/udev_node.c	2008-04-09 11:51:38.000000000 +0200
>@@ -103,7 +103,7 @@ static int udev_node_symlink(struct udev
> 		target[len] = '\0';
> 		if (strcmp(linktarget, target) == 0) {
> 			info("preserving symlink '%s' to '%s'", filename, linktarget);
>-			selinux_setfilecon(filename, NULL, S_IFLNK);
>+			selinux_setfilecon(filename, NULL, S_IFLNK);
> 			goto exit;
> 		} else {
> 			info("link '%s' points to different target '%s', delete it", filename, target);
>@@ -113,7 +113,7 @@ static int udev_node_symlink(struct udev
> 
> 	/* create link */
> 	info("creating symlink '%s' to '%s'", filename, linktarget);
>-	selinux_setfscreatecon(filename, NULL, S_IFLNK);
>+	selinux_setfscreatecon(filename, NULL, S_IFLNK);
> 	if (symlink(linktarget, filename) != 0) {
> 		if (errno != EEXIST) 
> 			err("symlink(%s, %s) failed: %s", linktarget, filename, strerror(errno));

Actions: View | Diff

Attachments on bug 441054: 301376 | 301574 | 301766 | 301767 | 301781