summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-07-26 07:50:55 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-07-26 07:50:55 +0000
commit229aa9e64424cf05fc2391ad2e7e2baefc37542f (patch)
tree0c0fed9887404c91c53652ae2fc3dc58b2abf551
parent307be5a3f2004d4c30732ab7340152614412eaed (diff)
downloadrsyslog-229aa9e64424cf05fc2391ad2e7e2baefc37542f.tar.gz
rsyslog-229aa9e64424cf05fc2391ad2e7e2baefc37542f.tar.xz
rsyslog-229aa9e64424cf05fc2391ad2e7e2baefc37542f.zip
applied patch from Michel Samia to fix compilation when NOT compiled for
pthreads
-rw-r--r--ChangeLog7
-rw-r--r--tcpsyslog.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1394c054..946761ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
---------------------------------------------------------------------------
Version 1.17.4 (rgerhards), 2007-07-2?
+- continued to work on modularization
+- fixed a situation where rsyslogd could create zombie processes
+ thanks to mildew for the patch
+- applied patch from Michel Samia to fix compilation when NOT
+ compiled for pthreads
---------------------------------------------------------------------------
Version 1.17.3 (rgerhards), 2007-07-25
- continued working on modularization
@@ -14,7 +19,7 @@ Version 1.17.3 (rgerhards), 2007-07-25
at all. If it cant, it complains and terminates
thanks to Michel Samia for providing the patch!
- fixed a small memory leak when HUPing syslogd. The allowed sender
- list now gets freed. thanks mildew to for the patch.
+ list now gets freed. thanks to mildew for the patch.
- changed the way error messages in early startup are logged. They
now do no longer use the syslogd code directly but are rather
send to stderr.
diff --git a/tcpsyslog.c b/tcpsyslog.c
index e8a52c97..1c7d2301 100644
--- a/tcpsyslog.c
+++ b/tcpsyslog.c
@@ -38,6 +38,9 @@
#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
#ifdef USE_PTHREADS
#include <pthread.h>
#endif