[git] GnuPG - branch, master, updated. gnupg-2.1.20-60-g60d9a9e

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  60d9a9e6b4ae3af029596d14732c02f49203326d (commit)
      from  f053f99ed0b0c6de7b7c4a07cbd7f7d213ddf0db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60d9a9e6b4ae3af029596d14732c02f49203326d
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Apr 12 11:44:10 2017 +0900

    dirmngr: Fix plus1_ns.
    
    * dirmngr/dns.c (plus1_ns): Fix the initial implementation.
    
    --
    
    Fixes-commit: 64904ce627b6b0661acf15b5b70103c4842bb0f3
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index ae3c3b0..39d3295 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -54,6 +54,9 @@
 #endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>		/* gettimeofday(2) */
+#endif
 #else
 #include <sys/time.h>		/* gettimeofday(2) */
 #include <sys/types.h>		/* FD_SETSIZE socklen_t */
@@ -1971,7 +1974,7 @@ void dns_p_dictadd(struct dns_packet *P, unsigned short dn) {
 static inline uint16_t
 plus1_ns (uint16_t count_net)
 {
-  uint16_t count = ntohs (count);
+  uint16_t count = ntohs (count_net);
 
   count++;
   return htons (count);

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/dns.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org