X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Ffloppy%2Fcreate_floppy_devices.c;h=f5069f722065b2aa56fb2bb9bcd5c8eb550a7282;hb=4dfe61c9668a0f6528de14ec413fce06be0b575c;hp=2c7d44b16d01a3d6f118fad26d7e0dd9353bb88a;hpb=7d563a17f3967890331daf08d43f2f005418139b;p=elogind.git

diff --git a/extras/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c
index 2c7d44b16..f5069f722 100644
--- a/extras/floppy/create_floppy_devices.c
+++ b/extras/floppy/create_floppy_devices.c
@@ -25,7 +25,6 @@
 #include <grp.h>
 
 #include "../../udev/udev.h"
-#include "../../udev/udev_selinux.h"
 
 static char *table[] = {
 	"", "d360", "h1200", "u360", "u720", "h360", "h720",
@@ -69,6 +68,7 @@ int main(int argc, char **argv)
 
 	logging_init("create_floppy_devices");
 	udev_set_log_fn(udev, log_fn);
+	udev_selinux_init(udev);
 
 	while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
 		switch (c) {
@@ -79,10 +79,10 @@ int main(int argc, char **argv)
 			print_nodes = 1;
 			break;
 		case 'U':
-			uid = lookup_user(udev, optarg);
+			uid = util_lookup_user(udev, optarg);
 			break;
 		case 'G':
-			gid = lookup_group(udev, optarg);
+			gid = util_lookup_group(udev, optarg);
 			break;
 		case 'M':
 			mode = strtol(optarg, NULL, 0);
@@ -145,8 +145,6 @@ int main(int argc, char **argv)
 	if (type == 0)
 		return 0;
 
-	selinux_init(udev);
-
 	i = 0;
 	while (table_sup[type][i]) {
 		sprintf(node, "%s%s", dev, table[table_sup[type][i]]);
@@ -155,16 +153,16 @@ int main(int argc, char **argv)
 			printf("%s b %d %d %d\n", node, mode, major, minor);
 		if (create_nodes) {
 			unlink(node);
-			selinux_setfscreatecon(udev, node, NULL, S_IFBLK | mode);
+			udev_selinux_setfscreatecon(udev, node, S_IFBLK | mode);
 			mknod(node, S_IFBLK | mode, makedev(major,minor));
-			selinux_resetfscreatecon(udev);
+			udev_selinux_resetfscreatecon(udev);
 			chown(node, uid, gid);
 			chmod(node, S_IFBLK | mode);
 		}
 		i++;
 	}
 
-	selinux_exit(udev);
+	udev_selinux_exit(udev);
 	udev_unref(udev);
 exit:
 	return 0;