From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 26 Sep 2007 11:15:42 +0000 (+0000)
Subject: fixup test.
X-Git-Tag: release-0.6~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a482dc7f22038f808bcdcda0457dc25f65afb39;p=thirdparty%2Funbound.git

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 b3f31f903..e696fffbd 100644
--- 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 5b063c4de..a1276ecb5 100644
--- 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 7ee3f25d9..4ea4b7611 100644
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 51795c64e..15d53985e 100644
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 1c9a3925f..f62ebd74f 100644
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 9ff6abcbe..4cdf73050 100644
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 787b2cf40..22e1c97b0 100644
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 dc5d17c0a..57e78d42e 100644
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 9c354a97c..02d566150 100644
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 26912bc01..60a6825eb 100644
--- 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)