g10: Remove option --always-trust if compiled without trust models.

[gnupg.git] / g10 / keyserver-internal.h

diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h
index 2fbfd54..6f6f430 100644 (file)
--- a/g10/keyserver-internal.h
+++ b/g10/keyserver-internal.h
@@ -1,11 +1,11 @@
 /* keyserver-internal.h - Keyserver internals
 /* 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.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * 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
+ * the Free Software Foundation; either version 3 of the License, or

  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,


@@ -14,30 +14,41 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * 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
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.

  */
 
 #ifndef _KEYSERVER_INTERNAL_H_
 #define _KEYSERVER_INTERNAL_H_
 
 #include <time.h>
  */
 
 #ifndef _KEYSERVER_INTERNAL_H_
 #define _KEYSERVER_INTERNAL_H_
 
 #include <time.h>

-#include "keyserver.h"
-#include "iobuf.h"
+#include "../common/keyserver.h"
+#include "../common/iobuf.h"

 #include "types.h"
 
 int parse_keyserver_options(char *options);
 void free_keyserver_spec(struct keyserver_spec *keyserver);
 #include "types.h"
 
 int parse_keyserver_options(char *options);
 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 *keyserver_match(struct keyserver_spec *spec);
+struct keyserver_spec *parse_keyserver_uri (const char *string,
+                                            int require_scheme);

 struct keyserver_spec *parse_preferred_keyserver(PKT_signature *sig);
 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,
-                           struct keyserver_spec *keyserver);
-int keyserver_import_keyid(u32 *keyid,struct keyserver_spec *keyserver);
-int keyserver_refresh(STRLIST users);
-int keyserver_search(STRLIST tokens);
+int keyserver_any_configured (ctrl_t ctrl);
+int keyserver_export (ctrl_t ctrl, strlist_t users);
+int keyserver_import (ctrl_t ctrl, strlist_t users);
+int keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
+                             struct keyserver_spec *keyserver);
+int keyserver_import_keyid (ctrl_t ctrl, u32 *keyid,
+                            struct keyserver_spec *keyserver);
+gpg_error_t keyserver_refresh (ctrl_t ctrl, strlist_t users);
+gpg_error_t keyserver_search (ctrl_t ctrl, strlist_t tokens);
+int keyserver_fetch (ctrl_t ctrl, strlist_t urilist);
+int keyserver_import_cert (ctrl_t ctrl, const char *name, int dane_mode,
+                           unsigned char **fpr,size_t *fpr_len);
+gpg_error_t keyserver_import_pka (ctrl_t ctrl, const char *name,
+                                  unsigned char **fpr,size_t *fpr_len);
+int keyserver_import_name (ctrl_t ctrl,
+                           const char *name,unsigned char **fpr,size_t *fpr_len,
+                           struct keyserver_spec *keyserver);
+int keyserver_import_ldap (ctrl_t ctrl, const char *name,
+                           unsigned char **fpr,size_t *fpr_len);

 
 #endif /* !_KEYSERVER_INTERNAL_H_ */
 
 #endif /* !_KEYSERVER_INTERNAL_H_ */