From: Tom Gundersen <teg@jklm.no>
Date: Mon, 18 May 2015 15:21:03 +0000 (+0200)
Subject: udevd: main - use _exit() when daemonizing
X-Git-Tag: v220~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f53d1fcdb355125a1347acf0d2d1ffa7264d6bfe;p=thirdparty%2Fsystemd.git

udevd: main - use _exit() when daemonizing

Makes it a bit clearer what is going on, rather than jumping to the end of main().

No functional change.
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 4f43a6fe121..19640cb6ea7 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1507,7 +1507,9 @@ int main(int argc, char *argv[]) {
                         r = log_error_errno(errno, "fork of daemon failed: %m");
                         goto exit;
                 default:
-                        goto exit_daemonize;
+                        mac_selinux_finish();
+                        log_close();
+                        _exit(EXIT_SUCCESS);
                 }
 
                 setsid();
@@ -1697,7 +1699,6 @@ int main(int argc, char *argv[]) {
 exit:
         if (manager)
                 udev_ctrl_cleanup(manager->ctrl);
-exit_daemonize:
         mac_selinux_finish();
         log_close();
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;