[PATCH] use numeric owner/group as default values to avoid parsing userdb

[elogind.git] / udev_selinux.c

diff --git a/udev_selinux.c b/udev_selinux.c
index cc6f4d7d3fad6716d468315993199afe67399887..72381f0d0d450e19d97d9019084efe308c9fde01 100644 (file)
--- a/udev_selinux.c
+++ b/udev_selinux.c
@@ -105,7 +105,7 @@ void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
                        } 
 
                if (setfilecon(file, scontext) < 0)
-                       dbg("setfilecon %s failed with error '%s'", file, strerror(errno));
+                       dbg("setfiles %s failed with error '%s'", file, strerror(errno));
 
                freecon(scontext);
        }
@@ -131,20 +131,12 @@ void selinux_setfscreatecon(const char *file, const char *devname, unsigned int
                        }
 
                if (setfscreatecon(scontext) < 0)
-                       dbg("setfscreatecon %s failed with error '%s'", file, strerror(errno));
+                       dbg("setfiles %s failed with error '%s'", file, strerror(errno));
 
                freecon(scontext);
        }
 }
 
-void selinux_resetfscreatecon(void)
-{
-       if (is_selinux_running()) {
-               if (setfscreatecon(prev_scontext) < 0)
-                       dbg("setfscreatecon %s failed with error '%s'", file, strerror(errno));
-       }
-}
-
 void selinux_init(void)
 {
        /*
@@ -152,17 +144,23 @@ void selinux_init(void)
         * restoration creation purposes.
         */
        if (is_selinux_running()) {
-               if (getfscreatecon(&prev_scontext) < 0) {
+               if (getfscreatecon(&prev_scontext) < 0)
                        dbg("getfscreatecon failed\n");
-                       prev_scontext = NULL;
-               }
+
+               prev_scontext = NULL;
        }
 }
 
-void selinux_exit(void)
+void selinux_restore(void)
 {
-       if (is_selinux_running() && prev_scontext) {
-               freecon(prev_scontext);
-               prev_scontext = NULL;
+       if (is_selinux_running()) {
+               /* reset the file create context to its former glory */
+               if (setfscreatecon(prev_scontext) < 0)
+                       dbg("setfscreatecon failed\n");
+
+               if (prev_scontext) {
+                       freecon(prev_scontext);
+                       prev_scontext = NULL;
+               }
        }
 }