mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
dirmngr: New command AD_QUERY.
* dirmngr/dirmngr.h: Include name-value.h
(struct server_control_s): Add rootdse and rootdse_tried.
* dirmngr/dirmngr.c (dirmngr_deinit_default_ctrl): Release them.
* dirmngr/ks-engine.h (KS_GET_FLAG_ROOTDSE): Add two new flags.
* dirmngr/ks-engine-ldap.c: Include ks-action.h
(SERVERINFO_GENERIC): New.
(struct ks_engine_ldap_local_s): Add scope.
(ks_ldap_new_state): Set a default scope.
(ks_ldap_clear_state): Ditto.
(my_ldap_connect): Add flag generic.
(return_all_attributes): New.
(fetch_rootdse): New.
(basedn_from_rootdse): New.
(ks_ldap_get): Move some code out to ...
(ks_ldap_prepare_my_state): New.
(ks_ldap_query): New.
* dirmngr/ks-action.c (ks_action_parse_uri): Factored out from server.c
(ks_action_query): New.
* dirmngr/server.c (make_keyserver_item): Factored most code out to
ks_action_parse_uri.
(cmd_ad_query): New.
* dirmngr/ks-engine-ldap.c (no_ldap_due_to_tor): New common error
printing. Now also with status line.
--
This command allows to query the Windows Active directory.
(cherry picked from commit 625aeb65b0
)
no_ldap_due_to_tor has been backported from 2.4
This commit is contained in:
parent
944479e21d
commit
2a3bad5985
8 changed files with 774 additions and 150 deletions
|
@ -27,6 +27,8 @@
|
|||
#define KS_GET_FLAG_ONLY_LDAP 1
|
||||
#define KS_GET_FLAG_FIRST 2
|
||||
#define KS_GET_FLAG_NEXT 4
|
||||
#define KS_GET_FLAG_ONLY_AD 8 /* Do this only if we have an AD. */
|
||||
#define KS_GET_FLAG_ROOTDSE 16 /* Get the rootDSE. */
|
||||
|
||||
|
||||
/*-- ks-action.c --*/
|
||||
|
@ -78,6 +80,9 @@ gpg_error_t ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri,
|
|||
gpg_error_t ks_ldap_put (ctrl_t ctrl, parsed_uri_t uri,
|
||||
void *data, size_t datalen,
|
||||
void *info, size_t infolen);
|
||||
gpg_error_t ks_ldap_query (ctrl_t ctrl, parsed_uri_t uri,
|
||||
unsigned int ks_get_flags,
|
||||
const char *filter, char **attrs, estream_t *r_fp);
|
||||
|
||||
|
||||
#endif /*DIRMNGR_KS_ENGINE_H*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue