From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 11 Nov 2009 16:18:38 +0000 (+0000)
Subject: review comments.  updated ldns tarball with 1.6.2.
X-Git-Tag: release-1.4.0rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb6253aa6c98f9bfd4017fac88d2dab323b1ccc5;p=thirdparty%2Funbound.git

review comments.  updated ldns tarball with 1.6.2.


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

diff --git a/doc/Changelog b/doc/Changelog
index 681f88ed4..354c8ab38 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+11 November 2009: Wouter
+	- ldns tarball updated (to 1.6.2).
+	- review comments.
+
 10 November 2009: Wouter
 	- Thanks to Surfnet found bug in new dnssec-retry code that failed
 	  to combine well when combined with DLV and a particular failure. 
diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index 34738bcd6..0236ddee6 100644
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ
diff --git a/testcode/replay.c b/testcode/replay.c
index 78dcbe5c5..03f5781f3 100644
--- a/testcode/replay.c
+++ b/testcode/replay.c
@@ -243,7 +243,7 @@ read_assign_step(char* remain, struct replay_moment* mom)
 		fatal_exit("cannot parse assign: %s", remain);
 	mom->variable = strdup(buf);
 	if(eq != '=')
-		fatal_exit("no = in assign: %s", remain);
+		fatal_exit("no '=' in assign: %s", remain);
 	remain += skip;
 	if(remain[0]) remain[strlen(remain)-1]=0; /* remove newline */
 	mom->string = strdup(remain);
@@ -308,7 +308,8 @@ replay_moment_read(char* remain, FILE* in, const char* name, int* lineno,
 				remain++;
 			mom->string = strdup(remain);
 			if(!mom->string) fatal_exit("out of memory");
-			mom->string[strlen(mom->string)-1]=0;
+			if(strlen(mom->string)>0)
+				mom->string[strlen(mom->string)-1]=0;
 			remain += strlen(mom->string);
 		}
 	} else if(parse_keyword(&remain, "CHECK_AUTOTRUST")) {
diff --git a/testcode/replay.h b/testcode/replay.h
index b065a624f..dcc0d02fa 100644
--- a/testcode/replay.h
+++ b/testcode/replay.h
@@ -88,7 +88,7 @@
  * 	o number is that number.
  * 	o ${variables and arithmetic }
  * 	o +, -, / and *.  Note, evaluated left-to-right. Use ${} for brackets.
- * 	  So again, no precedence rules, so 2+3*4 === ${2+3}*4 === 20.
+ * 	  So again, no precedence rules, so 2+3*4 == ${2+3}*4 = 20.
  * 	  Do 2+${3*4} to get 24.
  * 	o ${function params}
  *		o ${time} is the current time for the simulated unbound.
diff --git a/util/config_file.c b/util/config_file.c
index 36e832730..3b01f815e 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -1144,7 +1144,7 @@ void errinf_origin(struct module_qstate* qstate, struct sock_list *origin)
 		char buf[256];
 		if(p == origin)
 			snprintf(buf, sizeof(buf), "from ");
-		else	snprintf(buf, sizeof(buf), "and from ");
+		else	snprintf(buf, sizeof(buf), "and ");
 		if(p->len == 0)
 			snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), 
 				"cache");
diff --git a/util/net_help.c b/util/net_help.c
index 204995ead..d2e7fcca1 100644
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -506,7 +506,7 @@ void sock_list_insert(struct sock_list** list, struct sockaddr_storage* addr,
 	add->next = *list;
 	add->len = len;
 	*list = add;
-	if(len) memcpy(&add->addr, addr, len);
+	if(len) memmove(&add->addr, addr, len);
 }
 
 void sock_list_prepend(struct sock_list** list, struct sock_list* add)