move selinux noops to udev.h

diff --git a/TODO b/TODO
index ac996f40122c72c531840a119c78b2a7d87a2284..f960f2431b33480b7ce3753e4809a587bd114558 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-  add DEVTYPE
-
   o handle spaces in SYMLINK+=, do not create multiple links
   o use libudev device in udev_rules.c
       get rid of udevice, store rule matching state in rule iterator

diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am
index 337e7a325cccaa2c082af49ad7aba74f9a0595fe..357129e33691c02a5b44057be6b602dc70dcfe61 100644 (file)
--- a/extras/floppy/Makefile.am
+++ b/extras/floppy/Makefile.am
@@ -9,10 +9,11 @@ create_floppy_devices_SOURCES = \
        ../../udev/lib/libudev.h \
        ../../udev/lib/libudev.c \
        ../../udev/lib/libudev-util.c \
-       ../../udev/udev_utils.c \
-       ../../udev/udev_selinux.c
+       ../../udev/udev_utils.c
 
 if USE_SELINUX
+create_floppy_devices_SOURCES += \
+       ../../udev/udev_selinux.c
 create_floppy_devices_LDADD = \
        $(SELINUX_LIBS)
 endif

diff --git a/udev/Makefile.am b/udev/Makefile.am
index b9e2e89620b2da468625d5a70aef3dacd4dedc5a..c0df391d6f6d00e7d05e503ca7355ff09e484b80 100644 (file)
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -25,7 +25,6 @@ common_files = \
        udev_sysfs.c \
        udev_utils.c \
        udev_utils_file.c \
-       udev_selinux.c \
        list.h \
        lib/libudev.h \
        lib/libudev-private.h \
@@ -39,6 +38,8 @@ common_files = \
        lib/libudev-ctrl.c
 
 if USE_SELINUX
+common_files += \
+       udev_selinux.c
 common_ldadd += \
        $(SELINUX_LIBS)
 endif

diff --git a/udev/udev.h b/udev/udev.h
index b54d313bff68db2fc4997580d616857b43409bd4..6a685e6758cf15fac3b85a8a1135b7eb8170319b 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -168,11 +168,19 @@ extern void file_unmap(void *buf, size_t bufsize);
 extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur);
 
 /* udev_selinux */
+#ifndef USE_SELINUX
+static inline void selinux_init(struct udev *udev) {}
+static inline void selinux_exit(struct udev *udev) {}
+static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {}
+static inline void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {}
+static inline void udev_selinux_resetfscreatecon(struct udev *udev) {}
+#else
 extern void selinux_init(struct udev *udev);
 extern void selinux_exit(struct udev *udev);
 extern void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
 extern void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
 extern void udev_selinux_resetfscreatecon(struct udev *udev);
+#endif
 
 /* udevadm commands */
 extern int udevadm_monitor(struct udev *udev, int argc, char *argv[]);

diff --git a/udev/udev_selinux.c b/udev/udev_selinux.c
index 499f53c9169ca55ef204b745d0d85389dcedd78f..cf7f43496a953c3332d3272670e69cbb295d6b3b 100644 (file)
--- a/udev/udev_selinux.c
+++ b/udev/udev_selinux.c
@@ -22,18 +22,10 @@
 #include <stddef.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <selinux/selinux.h>
 
 #include "udev.h"
 
-#ifndef USE_SELINUX
-void selinux_init(struct udev *udev) {}
-void selinux_exit(struct udev *udev) {}
-void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {}
-void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {}
-void udev_selinux_resetfscreatecon(struct udev *udev) {}
-#else
-#include <selinux/selinux.h>
-
 static int selinux_enabled;
 security_context_t selinux_prev_scontext;
 
@@ -96,4 +88,3 @@ void udev_selinux_resetfscreatecon(struct udev *udev)
        if (setfscreatecon(selinux_prev_scontext) < 0)
                err(udev, "setfscreatecon failed: %m\n");
 }
-#endif