X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_selinux.c;h=b802e1fc6ee36016824db6968129ee0041839e37;hp=f014ea55359d6653950a419fd33827dff76e2cf9;hb=eef5447934a07279bc76f3f65b0302ddea8556ab;hpb=0105b9330cace0a1492003968a5d2552f1b64f43

diff --git a/udev_selinux.c b/udev_selinux.c
index f014ea553..b802e1fc6 100644
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -1,6 +1,4 @@
 /*
- * udev_selinux.h
- *
  * Copyright (C) 2004 Daniel Walsh
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -30,8 +28,8 @@
 #include <errno.h>
 #include <selinux/selinux.h>
 
+#include "udev.h"
 #include "udev_selinux.h"
-#include "logging.h"
 
 static security_context_t prev_scontext = NULL;
 
@@ -54,7 +52,7 @@ static char *get_media(const char *devname, int mode)
 	int size;
 	char *media = NULL;
 
-	if (!(mode && S_IFBLK))
+	if (!(mode & S_IFBLK))
 		return NULL;
 
 	snprintf(procfile, PATH_MAX, "/proc/ide/%s/media", devname);
@@ -152,7 +150,7 @@ void selinux_init(void)
 	 * restoration creation purposes.
 	 */
 	if (is_selinux_running()) {
-		matchpathcon_init_prefix(NULL, "/dev");
+		matchpathcon_init_prefix(NULL, udev_root);
 		if (getfscreatecon(&prev_scontext) < 0) {
 			err("getfscreatecon failed\n");
 			prev_scontext = NULL;