[PATCH] remove selinux support from udev core as it's no longer needed.

[elogind.git] / udev-add.c

diff --git a/udev-add.c b/udev-add.c
index de1fb953c4e774c8427bbb4d1646ab9d53f88e5c..aef755442fd3c4ecfab6d36489d65cb8c963a28e 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -37,9 +37,8 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
-#include "udev_selinux.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -141,7 +140,7 @@ static void set_to_local_user(char *user)
        struct utmp *u;
        time_t recent = 0;
 
-       strnfieldcpy(user, default_owner_str, OWNER_SIZE);
+       strfieldcpymax(user, default_owner_str, OWNER_SIZE);
        setutent();
        while (1) {
                u = getutent();
@@ -158,7 +157,7 @@ static void set_to_local_user(char *user)
 
                if (u->ut_time > recent) {
                        recent = u->ut_time;
-                       strnfieldcpy(user, u->ut_user, OWNER_SIZE);
+                       strfieldcpymax(user, u->ut_user, OWNER_SIZE);
                        dbg("local user is '%s'", user);
                        break;
                }
@@ -277,12 +276,9 @@ static int create_node(struct udevice *dev, int fake)
                }
        }
 
-       if (!fake)
-               selinux_add_node(filename);
-
        /* create symlink if requested */
        foreach_strpart(dev->symlink, " ", pos, len) {
-               strnfieldcpy(linkname, pos, len+1);
+               strfieldcpymax(linkname, pos, len+1);
                strfieldcpy(filename, udev_root);
                strfieldcat(filename, linkname);
                dbg("symlink '%s' to node '%s' requested", filename, dev->name);
@@ -417,7 +413,7 @@ int udev_add_device(char *path, char *subsystem, int fake)
        retval = create_node(&dev, fake);
 
        if ((retval == 0) && (!fake))
-               sysbus_send_create(&dev, path);
+               dev_d_send(&dev, subsystem);
 
 exit:
        if (class_dev)