diff options
| author | Werner Koch <[email protected]> | 2010-10-01 20:33:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-10-01 20:33:53 +0000 |
| commit | bfbd80feb95fba36292cd9dab43016f17b1e6972 (patch) | |
| tree | 9afbfd29e8aeb78fa34a1a49d8b8071554d4f593 /g10/getkey.c | |
| parent | * options.skel: Make the example for force-v3-sigs match reality (it (diff) | |
| download | gnupg-bfbd80feb95fba36292cd9dab43016f17b1e6972.tar.gz gnupg-bfbd80feb95fba36292cd9dab43016f17b1e6972.zip | |
Exporting secret keys via gpg-agent is now basically supported.
A couple of forward ported changes.
Doc updates.
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 401e66879..8d983487b 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -676,7 +676,7 @@ key_byname (GETKEY_CTX *retctx, strlist_t namelist, to import the key via the online mechanisms defined by --auto-key-locate. */ int -get_pubkey_byname (GETKEY_CTX * retctx, PKT_public_key * pk, +get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk, const char *name, KBNODE * ret_keyblock, KEYDB_HANDLE * ret_kdbhd, int include_unusable, int no_akl) { @@ -770,21 +770,21 @@ get_pubkey_byname (GETKEY_CTX * retctx, PKT_public_key * pk, case AKL_CERT: mechanism = "DNS CERT"; glo_ctrl.in_auto_key_retrieve++; - rc = keyserver_import_cert (name, &fpr, &fpr_len); + rc = keyserver_import_cert (ctrl, name, &fpr, &fpr_len); glo_ctrl.in_auto_key_retrieve--; break; case AKL_PKA: mechanism = "PKA"; glo_ctrl.in_auto_key_retrieve++; - rc = keyserver_import_pka (name, &fpr, &fpr_len); + rc = keyserver_import_pka (ctrl, name, &fpr, &fpr_len); glo_ctrl.in_auto_key_retrieve--; break; case AKL_LDAP: mechanism = "LDAP"; glo_ctrl.in_auto_key_retrieve++; - rc = keyserver_import_ldap (name, &fpr, &fpr_len); + rc = keyserver_import_ldap (ctrl, name, &fpr, &fpr_len); glo_ctrl.in_auto_key_retrieve--; break; @@ -797,9 +797,8 @@ get_pubkey_byname (GETKEY_CTX * retctx, PKT_public_key * pk, { mechanism = opt.keyserver->uri; glo_ctrl.in_auto_key_retrieve++; - rc = - keyserver_import_name (name, &fpr, &fpr_len, - opt.keyserver); + rc = keyserver_import_name (ctrl, name, &fpr, &fpr_len, + opt.keyserver); glo_ctrl.in_auto_key_retrieve--; } else @@ -816,7 +815,8 @@ get_pubkey_byname (GETKEY_CTX * retctx, PKT_public_key * pk, mechanism = akl->spec->uri; keyserver = keyserver_match (akl->spec); glo_ctrl.in_auto_key_retrieve++; - rc = keyserver_import_name (name, &fpr, &fpr_len, keyserver); + rc = keyserver_import_name (ctrl, + name, &fpr, &fpr_len, keyserver); glo_ctrl.in_auto_key_retrieve--; } break; |