diff options
author | David Shaw <[email protected]> | 2006-02-24 14:27:22 +0000 |
---|---|---|
committer | David Shaw <[email protected]> | 2006-02-24 14:27:22 +0000 |
commit | f4f5ea43e76fff8941a8148e70f237b7c4033b41 (patch) | |
tree | c9bde0dd601fb120ca0b4b81ff279a318cb42b52 /g10/keyserver-internal.h | |
parent | * keyserver.c (parse_keyserver_options): Only change max_cert if it is (diff) | |
download | gnupg-f4f5ea43e76fff8941a8148e70f237b7c4033b41.tar.gz gnupg-f4f5ea43e76fff8941a8148e70f237b7c4033b41.zip |
* keydb.h, getkey.c (release_akl), gpg.c (main): Add
--no-auto-key-locate.
* options.h, gpg.c (main): Keep track of each keyserver registered so
we can match on them later.
* keyserver-internal.h, keyserver.c (cmp_keyserver_spec,
keyserver_match), gpgv.c: New. Find a keyserver that matches ours and
return its spec.
* getkey.c (get_pubkey_byname): Use it here to get the per-keyserver
options from an earlier keyserver.
Diffstat (limited to 'g10/keyserver-internal.h')
-rw-r--r-- | g10/keyserver-internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h index c35c57134..64accbaa0 100644 --- a/g10/keyserver-internal.h +++ b/g10/keyserver-internal.h @@ -1,5 +1,5 @@ /* keyserver-internal.h - Keyserver internals - * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -29,6 +29,7 @@ int parse_keyserver_options(char *options); void free_keyserver_spec(struct keyserver_spec *keyserver); +struct keyserver_spec *keyserver_match(struct keyserver_spec *spec); struct keyserver_spec *parse_keyserver_uri(const char *string, int require_scheme, const char *configname, |