From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 28 May 2017 01:00:05 +0000 (-0400)
Subject: CID 1358881: Reorganise code so it doesn’t look like a copy/paste error
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df657bd21f041d52dbd08fa7b790d7f39db11800;p=thirdparty%2Ffreeradius-server.git

CID 1358881: Reorganise code so it doesn’t look like a copy/paste error
---

diff --git a/src/main/radiusd.c b/src/main/radiusd.c
index d411ca86b15..67e7f2370a2 100644
--- a/src/main/radiusd.c
+++ b/src/main/radiusd.c
@@ -612,15 +612,16 @@ int main(int argc, char *argv[])
 	 *  immediately.  Use SIGTERM to shut down the server cleanly in
 	 *  that case.
 	 */
-	if ((fr_set_signal(SIGINT, sig_fatal) < 0)
-#ifdef SIGQUIT
-	     || (fr_set_signal(SIGQUIT, sig_fatal) < 0)
-#endif
-	) {
+	if (fr_set_signal(SIGINT, sig_fatal) < 0) {
+	set_signal_error:
 		PERROR("Failed installing signal handler");
 		fr_exit(EXIT_FAILURE);
 	}
 
+#ifdef SIGQUIT
+	if (fr_set_signal(SIGQUIT, sig_fatal) < 0) goto set_signal_error;
+#endif
+
 	/*
 	 *  Everything seems to have loaded OK, exit gracefully.
 	 */
@@ -639,11 +640,8 @@ int main(int argc, char *argv[])
 	signal(SIGPIPE, SIG_IGN);
 #endif
 
-	if ((fr_set_signal(SIGHUP, sig_hup) < 0) ||
-	    (fr_set_signal(SIGTERM, sig_fatal) < 0)) {
-		PERROR("Failed installing signal handler");
-		fr_exit(EXIT_FAILURE);
-	}
+	if (fr_set_signal(SIGHUP, sig_hup) < 0) goto set_signal_error;
+	if (fr_set_signal(SIGTERM, sig_fatal) < 0) goto set_signal_error;
 
 #ifdef WITH_STATS
 	radius_stats_init(0);