X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev.c;h=4fd8196bd93eb2c9e7e4faf2bbf73e276bea699a;hb=5fc523db68849a340bb73bd352048435a3178c52;hp=d1dd9e4838251bca244f82c3a6eea722a5417a3e;hpb=7a01f11afbcc0a639cc3676572a41445f7edb65d;p=elogind.git

diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index d1dd9e483..4fd8196bd 100644
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -33,18 +31,19 @@
 
 #include "libudev.h"
 #include "libudev-private.h"
-#include "../udev.h"
 
 struct udev {
 	int refcount;
 	void (*log_fn)(struct udev *udev,
 		       int priority, const char *file, int line, const char *fn,
 		       const char *format, va_list args);
+	void *userdata;
 	char *sys_path;
 	char *dev_path;
 	char *rules_path;
 	int log_priority;
 #ifdef USE_SELINUX
+	int selinux_initialized;
 	int selinux_enabled;
 	security_context_t selinux_prev_scontext;
 #endif
@@ -89,12 +88,29 @@ static void selinux_init(struct udev *udev)
 			udev->selinux_prev_scontext = NULL;
 		}
 	}
+	udev->selinux_initialized = 1;
 #endif
 }
 
+void *udev_get_userdata(struct udev *udev)
+{
+	if (udev == NULL)
+		return NULL;
+	return udev->userdata;
+}
+
+void udev_set_userdata(struct udev *udev, void *userdata)
+{
+	if (udev == NULL)
+		return;
+	udev->userdata = userdata;
+}
+
 static void selinux_exit(struct udev *udev)
 {
 #ifdef USE_SELINUX
+	if (!udev->selinux_initialized)
+		return;
 	if (udev->selinux_enabled) {
 		freecon(udev->selinux_prev_scontext);
 		udev->selinux_prev_scontext = NULL;
@@ -105,6 +121,8 @@ static void selinux_exit(struct udev *udev)
 void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode)
 {
 #ifdef USE_SELINUX
+	if (!udev->selinux_initialized)
+		selinux_init(udev);
 	if (udev->selinux_enabled) {
 		security_context_t scontext = NULL;
 
@@ -122,6 +140,8 @@ void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int
 void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode)
 {
 #ifdef USE_SELINUX
+	if (!udev->selinux_initialized)
+		selinux_init(udev);
 	if (udev->selinux_enabled) {
 		security_context_t scontext = NULL;
 
@@ -139,6 +159,8 @@ void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned i
 void udev_selinux_resetfscreatecon(struct udev *udev)
 {
 #ifdef USE_SELINUX
+	if (!udev->selinux_initialized)
+		selinux_init(udev);
 	if (udev->selinux_enabled) {
 		if (setfscreatecon(udev->selinux_prev_scontext) < 0)
 			err(udev, "setfscreatecon failed: %s\n", strerror(errno));
@@ -201,7 +223,7 @@ struct udev *udev_new(void)
 		goto err;
 	f = fopen(config_file, "r");
 	if (f != NULL) {
-		char line[LINE_SIZE];
+		char line[UTIL_LINE_SIZE];
 		int line_nr = 0;
 
 		while (fgets(line, sizeof(line), f)) {
@@ -295,7 +317,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);