mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-03 20:28:51 +01:00
51341badb6
* g10/call-dirmngr.c (record_output): New function. (ks_put_inq_cb): Use it here to generate a --with-colons like output instead of a custom format. * dirmngr/ks-action.c: Include "ldap-parse-uri.h". (ks_action_help): If the provided URI is an LDAP URI, then use ldap_parse_uri to parse. Call ks_ldap_help. (ks_action_search): If passed an LDAP URI, then call ks_ldap_search. (ks_action_get): Likewise. (ks_action_put): Likewise. Also, change data from a 'const void *' to a 'void *' and add info and infolen parameters. Add note that function may modify DATA. * dirmngr/ks-action.h (ks_action_put): Update declaration accordingly. * dirmngr/server.c: Include "ldap-parse-uri.h". (cmd_keyserver): If ITEM->URI is an LDAP URI, parse it using ldap_parse_uri. (hlp_ks_put): Improve documentation. (cmd_ks_put): Also pass info and infolen to ks_action_put. Improve documentation. * dirmngr/ks-engine.h (ks_ldap_help): New declaration. (ks_ldap_search): Likewise. (ks_ldap_get): Likewise. (ks_ldap_put): Likewise. * dirmngr/ks-engine-ldap.c: New file. * dirmngr/Makefile.am (dirmngr_SOURCES): Add ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h. (dirmngr_LDADD) [USE_LDAP]: Add $(ldaplibs). -- Signed-off-by: Neal H. Walfield <neal@g10code.de>
68 lines
2.6 KiB
C
68 lines
2.6 KiB
C
/* ks-engine.h - Keyserver engines definitions
|
|
* Copyright (C) 2011 Free Software Foundation, Inc.
|
|
* Copyright (C) 2015 g10 Code GmbH
|
|
*
|
|
* 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 3 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, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef DIRMNGR_KS_ENGINE_H
|
|
#define DIRMNGR_KS_ENGINE_H 1
|
|
|
|
#include "../common/http.h"
|
|
|
|
/*-- ks-action.c --*/
|
|
gpg_error_t ks_print_help (ctrl_t ctrl, const char *text);
|
|
gpg_error_t ks_printf_help (ctrl_t ctrl, const char *format,
|
|
...) JNLIB_GCC_A_PRINTF(2,3);
|
|
|
|
/*-- ks-engine-hkp.c --*/
|
|
gpg_error_t ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive);
|
|
gpg_error_t ks_hkp_print_hosttable (ctrl_t ctrl);
|
|
gpg_error_t ks_hkp_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
|
|
estream_t *r_fp);
|
|
gpg_error_t ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri,
|
|
const char *keyspec, estream_t *r_fp);
|
|
gpg_error_t ks_hkp_put (ctrl_t ctrl, parsed_uri_t uri,
|
|
const void *data, size_t datalen);
|
|
|
|
/*-- ks-engine-http.c --*/
|
|
gpg_error_t ks_http_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_http_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp);
|
|
|
|
|
|
/*-- ks-engine-finger.c --*/
|
|
gpg_error_t ks_finger_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_finger_fetch (ctrl_t ctrl, parsed_uri_t uri, estream_t *r_fp);
|
|
|
|
/*-- ks-engine-kdns.c --*/
|
|
gpg_error_t ks_kdns_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_kdns_fetch (ctrl_t ctrl, parsed_uri_t uri, estream_t *r_fp);
|
|
|
|
/*-- ks-engine-ldap.c --*/
|
|
gpg_error_t ks_ldap_help (ctrl_t ctrl, parsed_uri_t uri);
|
|
gpg_error_t ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
|
|
estream_t *r_fp);
|
|
gpg_error_t ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri,
|
|
const char *keyspec, estream_t *r_fp);
|
|
gpg_error_t ks_ldap_put (ctrl_t ctrl, parsed_uri_t uri,
|
|
void *data, size_t datalen,
|
|
void *info, size_t infolen);
|
|
|
|
|
|
#endif /*DIRMNGR_KS_ENGINE_H*/
|