From 2f3b27ac47e26e57796b66b670f378222ef45009 Mon Sep 17 00:00:00 2001
From: Michael Meffie <mmeffie@sinenomine.net>
Date: Wed, 9 Sep 2015 21:24:04 -0400
Subject: [PATCH] util: add CloseLog routine to close the server log

Add the missing complement to OpenLog().

Change-Id: I45e7e5d2da3241c163d2d4baa6b386167e90e582
Reviewed-on: http://gerrit.openafs.org/12002
Reviewed-by: Marcio Brito Barbosa <mbarbosa@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---
 src/util/afsutil.h   |  1 +
 src/util/serverLog.c | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index eef5c1cd2..90c20fcbc 100644
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -56,6 +56,7 @@ extern void FSLog(const char *format, ...)
 extern int OpenLog(const char *filename);
 extern int ReOpenLog(const char *fileName);
 extern void SetupLogSignals(void);
+extern void CloseLog(void);
 
 #ifdef AFS_NT40_ENV
 #ifndef _MFC_VER
diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 64f081d6e..5a6207b67 100644
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -408,3 +408,24 @@ ReOpenLog(const char *fileName)
     UNLOCK_SERVERLOG();
     return serverLogFD < 0 ? -1 : 0;
 }
+
+/*!
+ * Close the server log file.
+ *
+ * \note Must be preceeded by OpenLog().
+ */
+void
+CloseLog(void)
+{
+    LOCK_SERVERLOG();
+#ifndef AFS_NT40_ENV
+    if (serverLogSyslog) {
+	closelog();
+    } else
+#endif
+    if (serverLogFD >= 0) {
+	close(serverLogFD);
+	serverLogFD = -1;
+    }
+    UNLOCK_SERVERLOG();
+}
-- 
2.39.5