From 92c203d7056df229d5289e6c7d1f1000dbc7ce95 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 15 Feb 2009 16:58:52 +0100
Subject: daemon: return early from daemonize_set_user()

If no "user" is configured, return from daemonize_set_user().  Save
one level of indent.
---
 src/daemon.c | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'src/daemon.c')

diff --git a/src/daemon.c b/src/daemon.c
index 3071175f..d920ff6c 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -100,28 +100,29 @@ void
 daemonize_set_user(void)
 {
 #ifndef WIN32
-	if (user_name != NULL) {
-		/* get uid */
-		if (setgid(user_gid) == -1) {
-			g_error("cannot setgid for user \"%s\": %s",
-				user_name, g_strerror(errno));
-		}
+	if (user_name == NULL)
+		return;
+
+	/* get uid */
+	if (setgid(user_gid) == -1) {
+		g_error("cannot setgid for user \"%s\": %s",
+			user_name, g_strerror(errno));
+	}
 #ifdef _BSD_SOURCE
-		/* init suplementary groups
-		 * (must be done before we change our uid)
-		 */
-		if (initgroups(user_name, user_gid) == -1) {
-			g_warning("cannot init supplementary groups "
-				  "of user \"%s\": %s",
-				  user_name, g_strerror(errno));
-		}
+	/* init suplementary groups
+	 * (must be done before we change our uid)
+	 */
+	if (initgroups(user_name, user_gid) == -1) {
+		g_warning("cannot init supplementary groups "
+			  "of user \"%s\": %s",
+			  user_name, g_strerror(errno));
+	}
 #endif
 
-		/* set uid */
-		if (setuid(user_uid) == -1) {
-			g_error("cannot change to uid of user \"%s\": %s",
-				user_name, g_strerror(errno));
-		}
+	/* set uid */
+	if (setuid(user_uid) == -1) {
+		g_error("cannot change to uid of user \"%s\": %s",
+			user_name, g_strerror(errno));
 	}
 #endif
 }
-- 
cgit v1.2.3