fixup test.

git-svn-id: file:///svn/unbound/trunk@645 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/unbound.c b/daemon/unbound.c
index b3f31f903ec2e1600d8c49732025a43bf57a3717..e696fffbd04aa58244ed50f682f50b23ffa585d1 100644 (file)
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -183,7 +183,7 @@ readpid (const char* file)
                return -1;
        }
 
-       pid = strtol(pidbuf, &t, 10);
+       pid = (pid_t)strtol(pidbuf, &t, 10);
        
        if (*t && *t != '\n') {
                return -1;

diff --git a/doc/Changelog b/doc/Changelog
index 5b063c4de1a22c0da72fdcb99d2968d060bc633d..a1276ecb52600ca5a2fb7a2eafca37574ba1ec35 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 26 September 2007: Wouter
        - SIGHUP will reopen the log file.
        - Option to log to syslog.
+       - please lint, fixup tests (that went to syslog on open, oops).
 
 25 September 2007: Wouter
        - tests for NSEC3. Fixup bitmap checks for NSEC3.

diff --git a/testdata/fwd_no_edns.tpkg b/testdata/fwd_no_edns.tpkg
index 7ee3f25d9bc5a1529586f8a23b2194eab5089385..4ea4b76116292a351d8bbe6eea2a285df0d2908e 100644 (file)
Binary files a/testdata/fwd_no_edns.tpkg and b/testdata/fwd_no_edns.tpkg differ

diff --git a/testdata/fwd_tcp.tpkg b/testdata/fwd_tcp.tpkg
index 51795c64e175d7c6495038f2db270690aeafe8bd..15d53985effadf1b677d0b52c345ac78dd14eb3c 100644 (file)
Binary files a/testdata/fwd_tcp.tpkg and b/testdata/fwd_tcp.tpkg differ

diff --git a/testdata/fwd_tcp_tc.tpkg b/testdata/fwd_tcp_tc.tpkg
index 1c9a3925f028a77b01a29d85956ca976dc09a26d..f62ebd74f7071e2ce4e434be2fcb4e37c20fc281 100644 (file)
Binary files a/testdata/fwd_tcp_tc.tpkg and b/testdata/fwd_tcp_tc.tpkg differ

diff --git a/testdata/fwd_three.tpkg b/testdata/fwd_three.tpkg
index 9ff6abcbe36f8338f1e2237771313f83d4b40aec..4cdf73050bb160994b3a9492657d8e86c9e0c8e2 100644 (file)
Binary files a/testdata/fwd_three.tpkg and b/testdata/fwd_three.tpkg differ

diff --git a/testdata/fwd_three_service.tpkg b/testdata/fwd_three_service.tpkg
index 787b2cf40b9e063bb30be92be30e1be29e9eb1a2..22e1c97b0c0e2635da0ea3b932009b033f29bf8e 100644 (file)
Binary files a/testdata/fwd_three_service.tpkg and b/testdata/fwd_three_service.tpkg differ

diff --git a/testdata/fwd_ttlexpire.tpkg b/testdata/fwd_ttlexpire.tpkg
index dc5d17c0a9f5c0394eee129edce87bd3f73b56c0..57e78d42e0ad48a0628983b900dbf6dd452cf47e 100644 (file)
Binary files a/testdata/fwd_ttlexpire.tpkg and b/testdata/fwd_ttlexpire.tpkg differ

diff --git a/testdata/fwd_udp.tpkg b/testdata/fwd_udp.tpkg
index 9c354a97c8ea4186e33785a76726a8537c073a9b..02d566150793bc989ddabb2e29eb000a4c4569ce 100644 (file)
Binary files a/testdata/fwd_udp.tpkg and b/testdata/fwd_udp.tpkg differ

diff --git a/util/log.c b/util/log.c
index 26912bc013eba485c5b67d07bc7565d18342c599..60a6825ebcc23f7be983cb886cbcb187778f202a 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -78,7 +78,11 @@ log_init(const char* filename, int use_syslog)
                key_created = 1;
                ub_thread_key_create(&logkey, NULL);
        }
-       if(logfile || log_to_syslog)
+       if(logfile 
+#ifdef HAVE_SYSLOG_H
+       || log_to_syslog
+#endif
+       )
                verbose(VERB_DETAIL, "switching log to %s", 
                use_syslog?"syslog":(filename&&filename[0]?filename:"stderr"));
        if(logfile && logfile != stderr)