[git] GnuPG - branch, master, updated. gnupg-2.1.21-134-g2746028

[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  274602820cfbb15c7cdb4525acd9793bdb472e78 (commit)
       via  328fca187253c069e3630bd387a71f6d16e9820a (commit)
      from  e4c720fa3b31ebd3e9d764c6eab02729cf06124c (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 274602820cfbb15c7cdb4525acd9793bdb472e78
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jul 24 15:28:36 2017 +0900

    dirmngr: Minor fix for Windows.
    
    * dirmngr/http.c (connect_with_timeout): Use FD2INT.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/dirmngr/http.c b/dirmngr/http.c
index dea4c71..c641070 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -2745,7 +2745,7 @@ connect_with_timeout (assuan_fd_t sock,
     }
 
   FD_ZERO (&rset);
-  FD_SET (sock, &rset);
+  FD_SET (FD2INT (sock), &rset);
   wset = rset;
   tval.tv_sec = timeout / 1000;
   tval.tv_usec = (timeout % 1000) * 1000;

commit 328fca187253c069e3630bd387a71f6d16e9820a
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jul 24 15:26:20 2017 +0900

    agent: Minor fix for Windows.
    
    * agent/command-ssh.c (serve_mmapped_ssh_request): Add const
    qualifier.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index c5897ef..9d45a18 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -3707,7 +3707,7 @@ serve_mmapped_ssh_request (ctrl_t ctrl,
   gpg_error_t err;
   int send_err = 0;
   int valid_response = 0;
-  ssh_request_spec_t *spec;
+  const ssh_request_spec_t *spec;
   u32 msglen;
   estream_t request_stream, response_stream;
 

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

Summary of changes:
 agent/command-ssh.c | 2 +-
 dirmngr/http.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


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