Merge remote-tracking branch 'old-gitlab/develop' into develop

GazeboXu · Mar 28, 2017 · 3e1ff33 · 3e1ff33
2 parents 95e1f0a + 6797067
commit 3e1ff33
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Changelog b/Changelog
@@ -8,6 +8,7 @@
 	  Thanks Siali Yan
 	* Spelling errors in binaries and man pages
 	  Thanks Andreas Schulze
+	* removed duplicate condition in ldns_udp_send_query.
 
 1.7.0	2016-12-20
 	* Fix lookup of relative names in ldns_resolver_search.

diff --git a/net.c b/net.c
@@ -676,9 +676,6 @@ ldns_udp_send_query(ldns_buffer *qbin, int sockfd, const struct sockaddr_storage
 	if (bytes == -1 || (size_t)bytes != ldns_buffer_position(qbin)) {
 		return 0;
 	}
-	if ((size_t) bytes != ldns_buffer_position(qbin)) {
-		return 0;
-	}
 	return bytes;
 }