libudev: handle ! in sysname, add sysnum, return allocated list_entry on add

[elogind.git] / udev / lib / libudev.c

diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 3ff6cabbb01a7ed5e785502be10e14671a2569d0..3f7d0e547e61a774f5ff4c07d00dd2d97ac235cd 100644 (file)
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -25,9 +25,6 @@
 #include <errno.h>
 #include <string.h>
 #include <ctype.h>
-#ifdef USE_SELINUX
-#include <selinux/selinux.h>
-#endif
 
 #include "libudev.h"
 #include "libudev-private.h"
@@ -42,10 +39,6 @@ struct udev {
        char *dev_path;
        char *rules_path;
        int log_priority;
-#ifdef USE_SELINUX
-       int selinux_enabled;
-       security_context_t selinux_prev_scontext;
-#endif
        int run;
 };
 
@@ -71,25 +64,6 @@ static void log_stderr(struct udev *udev,
        vfprintf(stderr, format, args);
 }
 
-static void selinux_init(struct udev *udev)
-{
-#ifdef USE_SELINUX
-       /*
-        * record the present security context, for file-creation
-        * restoration creation purposes.
-        */
-       udev->selinux_enabled = (is_selinux_enabled() > 0);
-       info(udev, "selinux=%i\n", udev->selinux_enabled);
-       if (udev->selinux_enabled) {
-               matchpathcon_init_prefix(NULL, udev_get_dev_path(udev));
-               if (getfscreatecon(&udev->selinux_prev_scontext) < 0) {
-                       err(udev, "getfscreatecon failed\n");
-                       udev->selinux_prev_scontext = NULL;
-               }
-       }
-#endif
-}
-
 void *udev_get_userdata(struct udev *udev)
 {
        if (udev == NULL)
@@ -104,60 +78,6 @@ void udev_set_userdata(struct udev *udev, void *userdata)
        udev->userdata = userdata;
 }
 
-static void selinux_exit(struct udev *udev)
-{
-#ifdef USE_SELINUX
-       if (udev->selinux_enabled) {
-               freecon(udev->selinux_prev_scontext);
-               udev->selinux_prev_scontext = NULL;
-       }
-#endif
-}
-
-void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode)
-{
-#ifdef USE_SELINUX
-       if (udev->selinux_enabled) {
-               security_context_t scontext = NULL;
-
-               if (matchpathcon(file, mode, &scontext) < 0) {
-                       err(udev, "matchpathcon(%s) failed\n", file);
-                       return;
-               } 
-               if (lsetfilecon(file, scontext) < 0)
-                       err(udev, "setfilecon %s failed: %s\n", file, strerror(errno));
-               freecon(scontext);
-       }
-#endif
-}
-
-void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode)
-{
-#ifdef USE_SELINUX
-       if (udev->selinux_enabled) {
-               security_context_t scontext = NULL;
-
-               if (matchpathcon(file, mode, &scontext) < 0) {
-                       err(udev, "matchpathcon(%s) failed\n", file);
-                       return;
-               }
-               if (setfscreatecon(scontext) < 0)
-                       err(udev, "setfscreatecon %s failed: %s\n", file, strerror(errno));
-               freecon(scontext);
-       }
-#endif
-}
-
-void udev_selinux_resetfscreatecon(struct udev *udev)
-{
-#ifdef USE_SELINUX
-       if (udev->selinux_enabled) {
-               if (setfscreatecon(udev->selinux_prev_scontext) < 0)
-                       err(udev, "setfscreatecon failed: %s\n", strerror(errno));
-       }
-#endif
-}
-
 /**
  * udev_new:
  *
@@ -307,7 +227,6 @@ struct udev *udev_new(void)
 
        if (udev->dev_path == NULL || udev->sys_path == NULL)
                goto err;
-       selinux_init(udev);
        info(udev, "context %p created\n", udev);
        info(udev, "log_priority=%d\n", udev->log_priority);
        info(udev, "config_file='%s'\n", config_file);
@@ -355,7 +274,6 @@ void udev_unref(struct udev *udev)
        udev->refcount--;
        if (udev->refcount > 0)
                return;
-       selinux_exit(udev);
        free(udev->dev_path);
        free(udev->sys_path);
        free(udev->rules_path);
@@ -368,8 +286,7 @@ void udev_unref(struct udev *udev)
  * @udev: udev library context
  * @log_fn: function to be called for logging messages
  *
- * The built-in logging, which writes to stderr if the
- * LIBUDEV_DEBUG environment variable is set, can be
+ * The built-in logging, which writes to stderr, it can be
  * overridden by a custom function, to plug log messages
  * into the users logging functionality.
  *