From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 16 Mar 2007 20:13:07 +0000 (+0100)
Subject: selinux: move selinux_exit() to the main programs
X-Git-Tag: 174~2032
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=456cb387567da8a2beadf003dcbd874022dbc873;p=thirdparty%2Fsystemd.git

selinux: move selinux_exit() to the main programs
---

diff --git a/test-udev.c b/test-udev.c
index bbe50eeeb4c..e40a4484367 100644
--- a/test-udev.c
+++ b/test-udev.c
@@ -175,6 +175,7 @@ int main(int argc, char *argv[], char *envp[])
 fail:
 	udev_rules_cleanup(&rules);
 	sysfs_cleanup();
+	selinux_exit();
 
 exit:
 	logging_close();
diff --git a/udev_node.c b/udev_node.c
index d069dfc4aad..1632c2cc3ce 100644
--- a/udev_node.c
+++ b/udev_node.c
@@ -237,7 +237,6 @@ int udev_node_add(struct udevice *udev, struct udevice *udev_old)
 	}
 
 exit:
-	selinux_exit();
 	return retval;
 }
 
diff --git a/udevd.c b/udevd.c
index 2c92590dcd2..4aad165d8a8 100644
--- a/udevd.c
+++ b/udevd.c
@@ -1230,6 +1230,7 @@ int main(int argc, char *argv[], char *envp[])
 exit:
 	udev_rules_cleanup(&rules);
 	sysfs_cleanup();
+	selinux_exit();
 
 	if (signal_pipe[READ_END] >= 0)
 		close(signal_pipe[READ_END]);
diff --git a/udevstart.c b/udevstart.c
index 6e1cb050c49..6ea18272ea0 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -367,6 +367,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	udev_rules_cleanup(&rules);
 	sysfs_cleanup();
+	selinux_exit();
 	logging_close();
 	return 0;
 }