* mainproc.c (check_sig_and_print): If we're honoring preferred

keyservers, and auto-key-retrieve is set, try and get a missing key from
the preferred keyserver subpacket when we verify the sig.

* gpgv.c (parse_preferred_keyserver, free_keyserver_spec): Stubs.

* keyserver.c (keyidlist): Use new parse_preferred_keyserver function.
(keyserver_work): Use the passed-in keyserver spec rather than the options
global one.

* keyserver-internal.h, keyserver.c (parse_preferred_keyserver): New
function to take a sig and return a split out keyserver_spec.
(keyserver_import_keyid): Now takes a keyserver_spec.

1 files changed, 21 insertions, 2 deletions

diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h
index 7e02821f1..851f1a904 100644
--- a/g10/keyserver-internal.h
+++ b/g10/keyserver-internal.h
@@ -1,4 +1,22 @@
-/* Keyserver internals */
+/* keyserver-internal.h - Keyserver internals
+ * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
 
 #ifndef _KEYSERVER_INTERNAL_H_
 #define _KEYSERVER_INTERNAL_H_
@@ -13,10 +31,11 @@ void free_keyserver_spec(struct keyserver_spec *keyserver);
 struct keyserver_spec *parse_keyserver_uri(const char *uri,int require_scheme,
 					   const char *configname,
 					   unsigned int configlineno);
+struct keyserver_spec *parse_preferred_keyserver(PKT_signature *sig);
 int keyserver_export(STRLIST users);
 int keyserver_import(STRLIST users);
 int keyserver_import_fprint(const byte *fprint,size_t fprint_len);
-int keyserver_import_keyid(u32 *keyid);
+int keyserver_import_keyid(u32 *keyid,struct keyserver_spec *keyserver);
 int keyserver_refresh(STRLIST users);
 int keyserver_search(STRLIST tokens);