volume_id: remove unnecessary global variable

[elogind.git] / udev_selinux.c

diff --git a/udev_selinux.c b/udev_selinux.c
index 298c75566ca525230acfd0b669c7ee36381d96e1..eec950194c3e7cd7bf62aac2443164544232d36e 100644 (file)
--- 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.
  *
  */
 
@@ -26,13 +24,12 @@
 #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"
 #include "udev_selinux.h"
-#include "logging.h"
 
 static security_context_t prev_scontext = NULL;
 
@@ -43,7 +40,7 @@ static int is_selinux_running(void)
        if (selinux_enabled == -1) 
                selinux_enabled = (is_selinux_enabled() > 0);
 
-       dbg("selinux=%i", selinux_enabled);
+       dbg("selinux=%i\n", selinux_enabled);
        return selinux_enabled;
 }
 
@@ -55,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);
@@ -93,10 +90,12 @@ void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
                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)
@@ -105,8 +104,8 @@ void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
                                return;
                        } 
 
-               if (setfilecon(file, scontext) < 0)
-                       err("setfilecon %s failed: %s", file, strerror(errno));
+               if (lsetfilecon(file, scontext) < 0)
+                       err("setfilecon %s failed: %s\n", file, strerror(errno));
 
                freecon(scontext);
        }
@@ -119,10 +118,12 @@ 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)
@@ -132,7 +133,7 @@ void selinux_setfscreatecon(const char *file, const char *devname, unsigned int
                        }
 
                if (setfscreatecon(scontext) < 0)
-                       err("setfscreatecon %s failed: %s", file, strerror(errno));
+                       err("setfscreatecon %s failed: %s\n", file, strerror(errno));
 
                freecon(scontext);
        }
@@ -142,7 +143,7 @@ void selinux_resetfscreatecon(void)
 {
        if (is_selinux_running()) {
                if (setfscreatecon(prev_scontext) < 0)
-                       err("setfscreatecon failed: %s", strerror(errno));
+                       err("setfscreatecon failed: %s\n", strerror(errno));
        }
 }
 
@@ -153,6 +154,8 @@ void selinux_init(void)
         * restoration creation purposes.
         */
        if (is_selinux_running()) {
+               if (!udev_root[0])
+                       err("selinux_init: udev_root not set\n");
                matchpathcon_init_prefix(NULL, udev_root);
                if (getfscreatecon(&prev_scontext) < 0) {
                        err("getfscreatecon failed\n");