Merge 4.0p1 to the trunk.

1 files changed, 16 insertions, 0 deletions

diff --git a/log.c b/log.c
index 3f87a63ee..bab88feea 100644
--- a/log.c
+++ b/log.c
@@ -194,6 +194,9 @@ debug3(const char *fmt,...)
 void
 log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
 {
+#if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)
+        struct syslog_data sdata = SYSLOG_DATA_INIT;
+#endif
         argv0 = av0;
 
         switch (level) {
@@ -263,6 +266,19 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
                     (int) facility);
                 exit(1);
         }
+
+        /*
+         * If an external library (eg libwrap) attempts to use syslog
+         * immediately after reexec, syslog may be pointing to the wrong
+         * facility, so we force an open/close of syslog here.
+         */
+#if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)
+        openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);
+        closelog_r(&sdata);
+#else
+        openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility);
+        closelog();
+#endif
 }
 
 #define MSGBUFSIZ 1024