[git] GnuPG - branch, master, updated. gnupg-2.2.4-112-g660eafa

by NIIBE Yutaka cvs at cvs.gnupg.org
Fri Jan 26 02:59:24 CET 2018


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  660eafa3a9f68e116e9b0597edc317d8ff90f9b2 (commit)
       via  c2e69a7a8c4b21e125babd50e464e71e1535f173 (commit)
       via  d7207b39b71d1b07c4cddac602f29ec583f6d1ad (commit)
       via  08e686a6a6d5bcb5410228b388745d09686b260c (commit)
      from  149369a92b447d06863e79dfe5589321eaf1f237 (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 660eafa3a9f68e116e9b0597edc317d8ff90f9b2
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Jan 26 10:52:56 2018 +0900

    agent: Fix sending connecting process uid to pinentry.
    
    * agent/command-ssh.c (get_client_info): Use LOCAL_PEERCRED.
    
    --
    
    LOCAL_PEERUID was wrong (while there is LOCAL_PEERUUID).
    For FreeBSD and macOS, we can use LOCAL_PEERCRED to get uid.
    
    GnuPG-bug-id: 3757
    Fixes-commit: 28aa6890588cc108639951bb4bef03ac17743046
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 4ec02ec..7155446 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -3622,7 +3622,15 @@ get_client_info (int fd, struct peer_info_s *out)
     socklen_t len = sizeof (pid_t);
 
     getsockopt (fd, SOL_LOCAL, LOCAL_PEERPID, &client_pid, &len);
-    getsockopt (fd, SOL_LOCAL, LOCAL_PEERUID, &client_uid, &len);
+#if defined (LOCAL_PEERCRED)
+    {
+      struct xucred cr;
+      len = sizeof (struct xucred);
+
+      if (!getsockopt (fd, SOL_LOCAL, LOCAL_PEERCRED, &cr, &len))
+	client_uid = cr.cr_uid;
+    }
+#endif
   }
 #elif defined (LOCAL_PEEREID)
   {

commit c2e69a7a8c4b21e125babd50e464e71e1535f173
Merge: 149369a d7207b3
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Jan 26 10:47:28 2018 +0900

    Merge branch 'STABLE-BRANCH-2-2' into master
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>


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

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


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




More information about the Gnupg-commits mailing list