[svn] GnuPG - r4705 - in trunk: common g10

[svn author wk]

Author: wk
Date: 2008-03-06 19:28:47 +0100 (Thu, 06 Mar 2008)
New Revision: 4705

Modified:
   trunk/common/ChangeLog
   trunk/common/pka.c
   trunk/common/simple-pwquery.c
   trunk/g10/ChangeLog
   trunk/g10/getkey.c
Log:
Comment fixes.
Convey the new envvars when using simple-pwquery.


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2008-03-06 17:22:41 UTC (rev 4704)
+++ trunk/common/ChangeLog	2008-03-06 18:28:47 UTC (rev 4705)
@@ -1,3 +1,8 @@
+2008-03-06  Werner Koch  <wk at g10code.com>
+
+	* simple-pwquery.c (agent_send_all_options): Add support for
+	XAUTHORITY and PINENTRY_USER_DATA.
+
 2008-02-15  Marcus Brinkmann  <marcus at g10code.de>
 
 	* exechelp.c (gnupg_spawn_process_fd): Add flag DETACHED_PROCESS

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2008-03-06 17:22:41 UTC (rev 4704)
+++ trunk/g10/ChangeLog	2008-03-06 18:28:47 UTC (rev 4705)
@@ -1,3 +1,7 @@
+2008-02-26  Werner Koch  <wk at g10code.com>
+
+	* getkey.c (get_pubkey_byname): Fix comment.
+
 2008-02-14  Werner Koch  <wk at g10code.com>
 
 	* call-agent.c (default_inq_cb): New.

Modified: trunk/common/pka.c
===================================================================
--- trunk/common/pka.c	2008-03-06 17:22:41 UTC (rev 4704)
+++ trunk/common/pka.c	2008-03-06 18:28:47 UTC (rev 4705)
@@ -98,7 +98,7 @@
 
    On success the 20 byte SHA-1 fingerprint is stored at FPR and the
    URI will be returned in an allocated buffer.  Note that the URI
-   might be an zero length string as this information is optiobnal.
+   might be an zero length string as this information is optional.
    Caller must xfree the returned string.
 
    On error NULL is returned and the 20 bytes at FPR are not

Modified: trunk/common/simple-pwquery.c
===================================================================
--- trunk/common/simple-pwquery.c	2008-03-06 17:22:41 UTC (rev 4704)
+++ trunk/common/simple-pwquery.c	2008-03-06 18:28:47 UTC (rev 4705)
@@ -207,6 +207,8 @@
   char *dft_display = NULL;
   char *dft_ttyname = NULL;
   char *dft_ttytype = NULL;
+  char *dft_xauthority = NULL;
+  char *dft_pinentry_user_data = NULL;
   int rc = 0;
 
   dft_display = getenv ("DISPLAY");
@@ -285,6 +287,25 @@
   }
 #endif /*HAVE_SETLOCALE*/
 
+  /* Send the XAUTHORITY variable.  */
+  dft_xauthority = getenv ("XAUTHORITY");
+  if (dft_xauthority)
+    {
+      /* We ignore errors here because older gpg-agents don't support
+         this option.  */
+      send_one_option (ctx, errsource, "xauthority", dft_xauthority);
+    }
+
+  /* Send the PINENTRY_USER_DATA variable.  */
+  dft_pinentry_user_data = getenv ("PINENTRY_USER_DATA");
+  if (dft_pinentry_user_data)
+    {
+      /* We ignore errors here because older gpg-agents don't support
+         this option.  */
+      send_one_option (ctx, errsource, "pinentry-user-data", 
+                       opt_pinentry_user_data);
+    }
+
   return 0;
 }
 

Modified: trunk/g10/getkey.c
===================================================================
--- trunk/g10/getkey.c	2008-03-06 17:22:41 UTC (rev 4704)
+++ trunk/g10/getkey.c	2008-03-06 18:28:47 UTC (rev 4705)
@@ -912,9 +912,9 @@
 /* Find a public key from NAME and return the keyblock or the key.  If
    ret_kdb is not NULL, the KEYDB handle used to locate this keyblock
    is returned and the caller is responsible for closing it.  If a key
-   was not found and NAME is a valid RFC822 mailbox and PKA retrieval
-   has been enabled, we try to import the pkea via the PKA
-   mechanism. */
+   was not found and NAME is a valid RFC822 mailbox and --auto-key-locate
+   has been enabled, we try to import the key via the online mechanisms
+   defined by --auto-key-locate.  */
 int
 get_pubkey_byname (PKT_public_key *pk,
 		   const char *name, KBNODE *ret_keyblock,