summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-12-20 09:54:04 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-12-20 09:54:04 +0000
commit76007a666e17d9456cd7e3864f4e23223fae94c3 (patch)
treeeb38b42d3ac2ea71d108b4d7cb605ccc57b0c958
parent177eb0ec5d444537dd11c1dde3a20189d1e3ba71 (diff)
downloadrsyslog-76007a666e17d9456cd7e3864f4e23223fae94c3.tar.gz
rsyslog-76007a666e17d9456cd7e3864f4e23223fae94c3.tar.xz
rsyslog-76007a666e17d9456cd7e3864f4e23223fae94c3.zip
bugfix: when compiled without network support, unix sockets were not
properly closed
-rw-r--r--ChangeLog2
-rw-r--r--syslogd.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b5a69f9b..c34cd768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ Version 2.0.0 (rgerhards), 2007-12-??
- fixed a bug in llDestroy()
- bugfix: fixing memory leak when message queue is full and during
parsing. Thanks to varmojfekoj for the patch.
+- bugfix: when compiled without network support, unix sockets were
+ not properply closed
---------------------------------------------------------------------------
Version 1.21.0 (rgerhards), 2007-12-19
- GSS-API support for syslog/TCP connections was added. Thanks to
diff --git a/syslogd.c b/syslogd.c
index 963185c6..3c37b991 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -3634,11 +3634,11 @@ static void die(int sig)
#endif
/* now clean up the listener part */
-#ifdef SYSLOG_INET
/* Close the UNIX sockets. */
for (i = 0; i < nfunix; i++)
if (funix[i] != -1)
close(funix[i]);
+#ifdef SYSLOG_INET
/* Close the UDP inet socket. */
closeUDPListenSockets();
/* Close the TCP inet socket. */