selinux_init(udev) -> udev_selinux_init(udev)

diff --git a/udev/test-udev.c b/udev/test-udev.c
index 1cc83c4a694886ef0cae01c3eceeb5f951abc507..76045132bf1af5100cc06c3d678d663ae80ac19c 100644 (file)
--- a/udev/test-udev.c
+++ b/udev/test-udev.c
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
        if (udev == NULL)
                exit(1);
        info(udev, "version %s\n", VERSION);
        if (udev == NULL)
                exit(1);
        info(udev, "version %s\n", VERSION);

-       selinux_init(udev);
+       udev_selinux_init(udev);

 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));


@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
 fail:
        udev_rules_unref(rules);
 exit:
 fail:
        udev_rules_unref(rules);
 exit:

-       selinux_exit(udev);
+       udev_selinux_exit(udev);

        udev_unref(udev);
        if (err != 0)
                return 1;
        udev_unref(udev);
        if (err != 0)
                return 1;

diff --git a/udev/udev-selinux.c b/udev/udev-selinux.c
index cf7f43496a953c3332d3272670e69cbb295d6b3b..cd86870b1804de55bff42eaadb2eca15c8419338 100644 (file)
--- a/udev/udev-selinux.c
+++ b/udev/udev-selinux.c
@@ -29,7 +29,7 @@
 static int selinux_enabled;
 security_context_t selinux_prev_scontext;
 
 static int selinux_enabled;
 security_context_t selinux_prev_scontext;
 

-void selinux_init(struct udev *udev)
+void udev_selinux_init(struct udev *udev)

 {
        /* record the present security context */
        selinux_enabled = (is_selinux_enabled() > 0);
 {
        /* record the present security context */
        selinux_enabled = (is_selinux_enabled() > 0);


@@ -43,7 +43,7 @@ void selinux_init(struct udev *udev)
        }
 }
 
        }
 }
 

-void selinux_exit(struct udev *udev)
+void udev_selinux_exit(struct udev *udev)

 {
        if (!selinux_enabled)
                return;
 {
        if (!selinux_enabled)
                return;

diff --git a/udev/udev.h b/udev/udev.h
index c73ec906e18a824759ea693ece5fbff11a9b17f6..66ad73ad92dac868b522b802b78df21a320f9526 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -119,14 +119,14 @@ extern int run_program(struct udev *udev, const char *command, char **envp,
 
 /* udev-selinux.c */
 #ifndef USE_SELINUX
 
 /* udev-selinux.c */
 #ifndef USE_SELINUX

-static inline void selinux_init(struct udev *udev) {}
-static inline void selinux_exit(struct udev *udev) {}
+static inline void udev_selinux_init(struct udev *udev) {}
+static inline void udev_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
 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_init(struct udev *udev);
+extern void udev_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);
 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);

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 8fd976a6deac47db644279d72811bb947c0f54d3..2de9fbcf2212680be0474b0553b3f3e39faabfd9 100644 (file)
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 
        logging_init("udevadm");
        udev_set_log_fn(udev, log_fn);
 
        logging_init("udevadm");
        udev_set_log_fn(udev, log_fn);

-       selinux_init(udev);
+       udev_selinux_init(udev);

 
        /* see if we are a compat link, this will be removed in a future release */
        command = argv[0];
 
        /* see if we are a compat link, this will be removed in a future release */
        command = argv[0];


@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
        help(udev, argc, argv);
        rc = 2;
 out:
        help(udev, argc, argv);
        rc = 2;
 out:

-       selinux_exit(udev);
+       udev_selinux_exit(udev);

        udev_unref(udev);
        logging_close();
        return rc;
        udev_unref(udev);
        logging_close();
        return rc;

diff --git a/udev/udevd.c b/udev/udevd.c
index f812940364423dc6179220faed4c03f81de7be0c..4f46b6c1a9cf9ac13dfd824fb57c17953fe36e8d 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -648,7 +648,7 @@ int main(int argc, char *argv[])
        logging_init("udevd");
        udev_set_log_fn(udev, log_fn);
        info(udev, "version %s\n", VERSION);
        logging_init("udevd");
        udev_set_log_fn(udev, log_fn);
        info(udev, "version %s\n", VERSION);

-       selinux_init(udev);
+       udev_selinux_init(udev);

 
        while (1) {
                int option;
 
        while (1) {
                int option;


@@ -978,7 +978,7 @@ exit:
                close(inotify_fd);
        udev_monitor_unref(kernel_monitor);
 
                close(inotify_fd);
        udev_monitor_unref(kernel_monitor);
 

-       selinux_exit(udev);
+       udev_selinux_exit(udev);

        udev_unref(udev);
        logging_close();
        return rc;
        udev_unref(udev);
        logging_close();
        return rc;