X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=udev_selinux.c;h=3fa84a0d434dcb5f1bc94aff682a85f642552f03;hb=6d83d9a62468c2db4357b362f910b121c633a965;hp=a305e241367e18dc1fafaeebc5765e0fe4c58eeb;hpb=eb8b496e890de4ba347f78f0e7e978117ab2a479;p=elogind.git

diff --git a/udev_selinux.c b/udev_selinux.c
index a305e2413..3fa84a0d4 100644
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -24,8 +24,8 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <limits.h>
-#include <libgen.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <selinux/selinux.h>
 
 #include "udev.h"
@@ -75,7 +75,7 @@ static char *get_media(const char *devname, int mode)
 	}
 
 	media = strdup(mediabuf);
-	info("selinux_get_media(%s)='%s'\n", devname, media);
+	info("selinux_get_media(%s)='%s'", devname, media);
 
 close_out:
 	fclose(fp);
@@ -90,8 +90,7 @@ void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
 		char *media;
 		int ret = -1;
 
-		if(devname)
-		{
+		if (devname) {
 			media = get_media(devname, mode);
 			if (media) {
 				ret = matchmediacon(media, &scontext);
@@ -101,7 +100,7 @@ void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
 
 		if (ret < 0)
 			if (matchpathcon(file, mode, &scontext) < 0) {
-				err("matchpathcon(%s) failed\n", file);
+				err("matchpathcon(%s) failed", file);
 				return;
 			} 
 
@@ -119,15 +118,17 @@ void selinux_setfscreatecon(const char *file, const char *devname, unsigned int
 		char *media;
 		int ret = -1;
 
-		media = get_media(devname, mode);
-		if (media) {
-			ret = matchmediacon(media, &scontext);
-			free(media);
+		if (devname) {
+			media = get_media(devname, mode);
+			if (media) {
+				ret = matchmediacon(media, &scontext);
+				free(media);
+			}
 		}
 
 		if (ret < 0)
 			if (matchpathcon(file, mode, &scontext) < 0) {
-				err("matchpathcon(%s) failed\n", file);
+				err("matchpathcon(%s) failed", file);
 				return;
 			}
 
@@ -153,9 +154,11 @@ void selinux_init(void)
 	 * restoration creation purposes.
 	 */
 	if (is_selinux_running()) {
+		if (!udev_root[0])
+			err("selinux_init: udev_root not set");
 		matchpathcon_init_prefix(NULL, udev_root);
 		if (getfscreatecon(&prev_scontext) < 0) {
-			err("getfscreatecon failed\n");
+			err("getfscreatecon failed");
 			prev_scontext = NULL;
 		}
 	}