aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyserver.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2004-09-11 15:42:19 +0000
committerDavid Shaw <[email protected]>2004-09-11 15:42:19 +0000
commit45f99c58bb4713cfd2e116f81a010e822ae137b9 (patch)
tree347ab8a3460499431a96d547efc4a195770086d8 /g10/keyserver.c
parent* app-openpgp.c (get_cached_data): Avoid mallocing zero since it breaks us (diff)
downloadgnupg-45f99c58bb4713cfd2e116f81a010e822ae137b9.tar.gz
gnupg-45f99c58bb4713cfd2e116f81a010e822ae137b9.zip
* card-util.c (fetch_url, card_edit): Use the pubkey URL stored on the
card to fetch an updated copy. Works with either straight URLs or HKP or LDAP keyservers. * keyserver-internal.h, keyserver.c (keyserver_import_fprint), import.c (revocation_present): Use a keyserver_spec so the caller can pass in whatever keyserver they like.
Diffstat (limited to 'g10/keyserver.c')
-rw-r--r--g10/keyserver.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 93bc5966c..dc1230c64 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1318,7 +1318,8 @@ keyserver_import(STRLIST users)
}
int
-keyserver_import_fprint(const byte *fprint,size_t fprint_len)
+keyserver_import_fprint(const byte *fprint,size_t fprint_len,
+ struct keyserver_spec *keyserver)
{
KEYDB_SEARCH_DESC desc;
@@ -1333,7 +1334,7 @@ keyserver_import_fprint(const byte *fprint,size_t fprint_len)
memcpy(desc.u.fpr,fprint,fprint_len);
- return keyserver_work(GET,NULL,&desc,1,opt.keyserver);
+ return keyserver_work(GET,NULL,&desc,1,keyserver);
}
int