[Pkg-gnupg-commit] [gnupg2] 59/166: agent: Tell pinentry the hostname the agent is running on.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 042fe711c76f6377cedb8f83a73ba386cee34bb7
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Feb 3 21:16:26 2017 +0100

    agent: Tell pinentry the hostname the agent is running on.
    
    * agent/call-pinentry.c [!W32]: Incluse utsname.h
    (start_pinentry): Pass nodename to OPTION/owner.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 agent/call-pinentry.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 384b23a..9931665 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -31,6 +31,7 @@
 # include <sys/wait.h>
 # include <sys/types.h>
 # include <signal.h>
+# include <sys/utsname.h>
 #endif
 #include <npth.h>
 
@@ -544,7 +545,16 @@ start_pinentry (ctrl_t ctrl)
   if (ctrl->client_pid)
     {
       char *optstr;
-      if ((optstr = xtryasprintf ("OPTION owner=%lu", ctrl->client_pid)))
+      const char *nodename = "";
+
+#ifndef HAVE_W32_SYSTEM
+      struct utsname utsbuf;
+      if (!uname (&utsbuf))
+        nodename = utsbuf.nodename;
+#endif /*!HAVE_W32_SYSTEM*/
+
+      if ((optstr = xtryasprintf ("OPTION owner=%lu %s",
+                                  ctrl->client_pid, nodename)))
         {
           assuan_transact (entry_ctx, optstr, NULL, NULL, NULL, NULL, NULL,
                            NULL);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git