summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2008-03-06 19:28:47 +0100
committerWerner Koch <wk@gnupg.org>2008-03-06 19:28:47 +0100
commitfa800e7c86a9c927af4f46d3a6c0822fcc5dc9dc (patch)
tree06f650dca629a77b6165821e0bd5aeb9021541dc /g10
parentAdd IF command and new variable functions to gpg-connect-agent. (diff)
downloadgnupg2-fa800e7c86a9c927af4f46d3a6c0822fcc5dc9dc.tar.xz
gnupg2-fa800e7c86a9c927af4f46d3a6c0822fcc5dc9dc.zip
Comment fixes.
Convey the new envvars when using simple-pwquery.
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/getkey.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 47636a333..f4deed471 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-26 Werner Koch <wk@g10code.com>
+
+ * getkey.c (get_pubkey_byname): Fix comment.
+
2008-02-14 Werner Koch <wk@g10code.com>
* call-agent.c (default_inq_cb): New.
diff --git a/g10/getkey.c b/g10/getkey.c
index d0d9bf451..c1d21f109 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -912,9 +912,9 @@ key_byname( GETKEY_CTX *retctx, strlist_t namelist,
/* 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,