From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 15 Jul 2008 15:05:12 +0000 (+0000)
Subject: - lowered log_hex blocksize to fit through BSD syslog linesize.
X-Git-Tag: release-1.0.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4263f2a6923c892f878ec532924b1184ab0d389b;p=thirdparty%2Funbound.git

- lowered log_hex blocksize to fit through BSD syslog linesize.
- no useless initialisation if getpwnam not available.
- iana, ldns snapshot updated.



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

diff --git a/Makefile.in b/Makefile.in
index d4172fd75..312c706f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -290,8 +290,8 @@ uninstall:
 	@echo "You still need to remove "`dirname $(DESTDIR)$(configfile)`" , $(DESTDIR)$(configfile) by hand"
 
 download_ldns:
-	svn export https://www.nlnetlabs.nl/ldns/svn/trunk/makedist.sh ldns_makedist.sh
-	./ldns_makedist.sh -s -d https://www.nlnetlabs.nl/ldns/svn/trunk
+	svn export https://www.nlnetlabs.nl/svn/ldns/trunk/makedist.sh ldns_makedist.sh
+	./ldns_makedist.sh -s -d https://www.nlnetlabs.nl/svn/ldns/trunk
 	mv ldns-*_pre_*.tar.gz ldns-src.tar.gz
 	rm ldns-*_pre_*.tar.gz.sha1 ldns_makedist.sh
 
diff --git a/contrib/unbound.spec b/contrib/unbound.spec
index 61bf707d6..51e0a9569 100644
--- a/contrib/unbound.spec
+++ b/contrib/unbound.spec
@@ -1,6 +1,6 @@
 Summary: Validating, recursive, and caching DNS resolver
 Name: unbound
-Version: 1.0.0
+Version: 1.0.1
 Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
diff --git a/daemon/unbound.c b/daemon/unbound.c
index 7e7174180..2c2fcb5c1 100644
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -305,6 +305,7 @@ static void
 do_chroot(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 	char** cfgfile)
 {
+#ifdef HAVE_GETPWNAM
 	uid_t uid;
 	gid_t gid;
 	/* initialize, but not to 0 (root) */
@@ -313,7 +314,6 @@ do_chroot(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 	log_assert(cfg);
 
 	/* daemonize last to be able to print error to user */
-#ifdef HAVE_GETPWNAM
 	if(cfg->username && cfg->username[0]) {
 		struct passwd *pwd;
 		if((pwd = getpwnam(cfg->username)) == NULL)
diff --git a/doc/Changelog b/doc/Changelog
index 82b14794e..eb61d96e9 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,9 @@
 	  IPv6 example prefix to AS112 default blocklist.
 	- fixup lookup of DS records by client with trustanchor for same.
 	- libunbound ub_resolve, fix handling of error condition during setup.
+	- lowered log_hex blocksize to fit through BSD syslog linesize.
+	- no useless initialisation if getpwnam not available.
+	- iana, ldns snapshot updated.
 
 3 July 2008: Wouter
 	- Matthijs fixed memory leaks in root hints file reading.
diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index 72e11acc1..ac99a720c 100644
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ
diff --git a/util/log.c b/util/log.c
index 1245f8eff..caa13d4a5 100644
--- a/util/log.c
+++ b/util/log.c
@@ -242,7 +242,7 @@ log_hex(const char* msg, void* data, size_t length)
 	uint8_t* data8 = (uint8_t*)data;
 	const char* hexchar = "0123456789ABCDEF";
 	char buf[1024+1]; /* alloc blocksize hex chars + \0 */
-	const size_t blocksize = 1024;
+	const size_t blocksize = 512;
 	size_t len;
 
 	if(length == 0) {