mirror of git://git.gnupg.org/gnupg.git
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> |
||
---|---|---|
.. | ||
ChangeLog-2011 | ||
ChangeLog.1 | ||
Makefile.am | ||
OAUTHORS | ||
ONEWS | ||
cdb.h | ||
cdblib.c | ||
certcache.c | ||
certcache.h | ||
crlcache.c | ||
crlcache.h | ||
crlfetch.c | ||
crlfetch.h | ||
dirmngr-client.c | ||
dirmngr-err.h | ||
dirmngr.c | ||
dirmngr.h | ||
dirmngr_ldap.c | ||
ks-action.c | ||
ks-action.h | ||
ks-engine-finger.c | ||
ks-engine-hkp.c | ||
ks-engine-http.c | ||
ks-engine-kdns.c | ||
ks-engine-ldap.c | ||
ks-engine.h | ||
ldap-parse-uri.c | ||
ldap-parse-uri.h | ||
ldap-url.c | ||
ldap-url.h | ||
ldap-wrapper-ce.c | ||
ldap-wrapper.c | ||
ldap-wrapper.h | ||
ldap.c | ||
ldapserver.c | ||
ldapserver.h | ||
misc.c | ||
misc.h | ||
ocsp.c | ||
ocsp.h | ||
server.c | ||
sks-keyservers.netCA.pem | ||
t-ldap-parse-uri.c | ||
t-support.h | ||
validate.c | ||
validate.h | ||
w32-ldap-help.h |