From d0345ede266fa361e07bbd337be33517ede442c5 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 8 Jul 2015 17:01:15 +0200
Subject: [PATCH] logging: allow calling nm_logging_syslog_openlog() only once

---
 src/nm-logging.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/nm-logging.c b/src/nm-logging.c
index d4fe998ecf..f6936e8243 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -473,18 +473,18 @@ nm_log_handler (const gchar *log_domain,
 void
 nm_logging_syslog_openlog (gboolean debug)
 {
+	if (syslog_opened)
+		g_return_if_reached ();
+	syslog_opened = TRUE;
+
 	if (debug)
 		openlog (G_LOG_DOMAIN, LOG_CONS | LOG_PERROR | LOG_PID, LOG_USER);
 	else
 		openlog (G_LOG_DOMAIN, LOG_PID, LOG_DAEMON);
 
-	if (!syslog_opened) {
-		syslog_opened = TRUE;
-
-		g_log_set_handler (G_LOG_DOMAIN,
-		                   G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
-		                   nm_log_handler,
-		                   NULL);
-	}
+	g_log_set_handler (G_LOG_DOMAIN,
+	                   G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
+	                   nm_log_handler,
+	                   NULL);
 }