filelog: Ignore flush_line option if setlinebuf() not supported

diff --git a/configure.ac b/configure.ac
index 0dc5ac6ff260eb859420a38987851a8450644e5b..e3e4f881a6dd6c9030425f13a9911a4ae2b36f9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -568,7 +568,7 @@ AC_CHECK_FUNC(
 )
 
 AC_CHECK_FUNCS(prctl mallinfo getpass closefrom getpwnam_r getgrnam_r getpwuid_r)
-AC_CHECK_FUNCS(fmemopen funopen mmap memrchr syslog)
+AC_CHECK_FUNCS(fmemopen funopen mmap memrchr syslog setlinebuf)
 
 AC_CHECK_HEADERS(sys/sockio.h glob.h net/if_tun.h linux/fib_rules.h)
 AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h netinet6/ipsec.h linux/udp.h)

diff --git a/src/libcharon/bus/listeners/file_logger.c b/src/libcharon/bus/listeners/file_logger.c
index 68a386d118a1925cbe87df5b2d017115af1c380a..c86cff132f1da96dafd5b18e04a7404e5d9ca20b 100644 (file)
--- a/src/libcharon/bus/listeners/file_logger.c
+++ b/src/libcharon/bus/listeners/file_logger.c
@@ -214,10 +214,12 @@ METHOD(file_logger_t, open_, void,
                                 this->filename, strerror(errno));
                        return;
                }
+#ifdef HAVE_SETLINEBUF
                if (flush_line)
                {
                        setlinebuf(file);
                }
+#endif /* HAVE_SETLINEBUF */
        }
        this->lock->write_lock(this->lock);
        close_file(this);