1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00

s4-ldb: added ldb command line hook support

ldb modules can now add hooks to the command line processing for ldb
tools

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Tridgell 2010-11-01 15:41:07 +11:00
parent fd8815335d
commit f924a022cb
5 changed files with 273 additions and 65 deletions

View File

@ -0,0 +1,240 @@
ldb_add: int (struct ldb_context *, const struct ldb_message *)
ldb_any_comparison: int (struct ldb_context *, void *, ldb_attr_handler_t, const struct ldb_val *, const struct ldb_val *)
ldb_asprintf_errstring: void (struct ldb_context *, const char *, ...)
ldb_asq_init: int (const char *)
ldb_attr_casefold: char *(TALLOC_CTX *, const char *)
ldb_attr_dn: int (const char *)
ldb_attr_in_list: int (const char * const *, const char *)
ldb_attr_list_copy: const char **(TALLOC_CTX *, const char * const *)
ldb_attr_list_copy_add: const char **(TALLOC_CTX *, const char * const *, const char *)
ldb_base64_decode: int (char *)
ldb_base64_encode: char *(TALLOC_CTX *, const char *, int)
ldb_binary_decode: struct ldb_val (TALLOC_CTX *, const char *)
ldb_binary_encode: char *(TALLOC_CTX *, struct ldb_val)
ldb_binary_encode_string: char *(TALLOC_CTX *, const char *)
ldb_build_add_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
ldb_build_del_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
ldb_build_extended_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, const char *, void *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
ldb_build_mod_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
ldb_build_rename_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, struct ldb_dn *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
ldb_build_search_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, enum ldb_scope, const char *, const char * const *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
ldb_build_search_req_ex: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, enum ldb_scope, struct ldb_parse_tree *, const char * const *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
ldb_casefold: char *(struct ldb_context *, TALLOC_CTX *, const char *, size_t)
ldb_casefold_default: char *(void *, TALLOC_CTX *, const char *, size_t)
ldb_comparison_binary: int (struct ldb_context *, void *, const struct ldb_val *, const struct ldb_val *)
ldb_comparison_fold: int (struct ldb_context *, void *, const struct ldb_val *, const struct ldb_val *)
ldb_connect: int (struct ldb_context *, const char *, unsigned int, const char **)
ldb_connect_backend: int (struct ldb_context *, const char *, const char **, struct ldb_module **)
ldb_debug: void (struct ldb_context *, enum ldb_debug_level, const char *, ...)
ldb_debug_add: void (struct ldb_context *, const char *, ...)
ldb_debug_end: void (struct ldb_context *, enum ldb_debug_level)
ldb_debug_set: void (struct ldb_context *, enum ldb_debug_level, const char *, ...)
ldb_delete: int (struct ldb_context *, struct ldb_dn *)
ldb_dn_add_base: bool (struct ldb_dn *, struct ldb_dn *)
ldb_dn_add_base_fmt: bool (struct ldb_dn *, const char *, ...)
ldb_dn_add_child: bool (struct ldb_dn *, struct ldb_dn *)
ldb_dn_add_child_fmt: bool (struct ldb_dn *, const char *, ...)
ldb_dn_alloc_casefold: char *(TALLOC_CTX *, struct ldb_dn *)
ldb_dn_alloc_linearized: char *(TALLOC_CTX *, struct ldb_dn *)
ldb_dn_canonical_ex_string: char *(TALLOC_CTX *, struct ldb_dn *)
ldb_dn_canonical_string: char *(TALLOC_CTX *, struct ldb_dn *)
ldb_dn_check_local: bool (struct ldb_module *, struct ldb_dn *)
ldb_dn_check_special: bool (struct ldb_dn *, const char *)
ldb_dn_compare: int (struct ldb_dn *, struct ldb_dn *)
ldb_dn_compare_base: int (struct ldb_dn *, struct ldb_dn *)
ldb_dn_copy: struct ldb_dn *(TALLOC_CTX *, struct ldb_dn *)
ldb_dn_escape_value: char *(TALLOC_CTX *, struct ldb_val)
ldb_dn_extended_add_syntax: int (struct ldb_context *, unsigned int, const struct ldb_dn_extended_syntax *)
ldb_dn_extended_filter: void (struct ldb_dn *, const char * const *)
ldb_dn_extended_syntax_by_name: const struct ldb_dn_extended_syntax *(struct ldb_context *, const char *)
ldb_dn_from_ldb_val: struct ldb_dn *(TALLOC_CTX *, struct ldb_context *, const struct ldb_val *)
ldb_dn_get_casefold: const char *(struct ldb_dn *)
ldb_dn_get_comp_num: int (struct ldb_dn *)
ldb_dn_get_component_name: const char *(struct ldb_dn *, unsigned int)
ldb_dn_get_component_val: const struct ldb_val *(struct ldb_dn *, unsigned int)
ldb_dn_get_extended_component: const struct ldb_val *(struct ldb_dn *, const char *)
ldb_dn_get_extended_linearized: char *(TALLOC_CTX *, struct ldb_dn *, int)
ldb_dn_get_linearized: const char *(struct ldb_dn *)
ldb_dn_get_parent: struct ldb_dn *(TALLOC_CTX *, struct ldb_dn *)
ldb_dn_get_rdn_name: const char *(struct ldb_dn *)
ldb_dn_get_rdn_val: const struct ldb_val *(struct ldb_dn *)
ldb_dn_has_extended: bool (struct ldb_dn *)
ldb_dn_is_null: bool (struct ldb_dn *)
ldb_dn_is_special: bool (struct ldb_dn *)
ldb_dn_is_valid: bool (struct ldb_dn *)
ldb_dn_map_local: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
ldb_dn_map_rebase_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
ldb_dn_map_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
ldb_dn_new: struct ldb_dn *(TALLOC_CTX *, struct ldb_context *, const char *)
ldb_dn_new_fmt: struct ldb_dn *(TALLOC_CTX *, struct ldb_context *, const char *, ...)
ldb_dn_remove_base_components: bool (struct ldb_dn *, unsigned int)
ldb_dn_remove_child_components: bool (struct ldb_dn *, unsigned int)
ldb_dn_remove_extended_components: void (struct ldb_dn *)
ldb_dn_set_component: int (struct ldb_dn *, int, const char *, const struct ldb_val)
ldb_dn_set_extended_component: int (struct ldb_dn *, const char *, const struct ldb_val *)
ldb_dn_update_components: int (struct ldb_dn *, const struct ldb_dn *)
ldb_dn_validate: bool (struct ldb_dn *)
ldb_dump_results: void (struct ldb_context *, struct ldb_result *, FILE *)
ldb_error_at: int (struct ldb_context *, int, const char *, const char *, int)
ldb_errstring: const char *(struct ldb_context *)
ldb_extended: int (struct ldb_context *, const char *, void *, struct ldb_result **)
ldb_extended_default_callback: int (struct ldb_request *, struct ldb_reply *)
ldb_filter_from_tree: char *(TALLOC_CTX *, struct ldb_parse_tree *)
ldb_get_config_basedn: struct ldb_dn *(struct ldb_context *)
ldb_get_create_perms: unsigned int (struct ldb_context *)
ldb_get_default_basedn: struct ldb_dn *(struct ldb_context *)
ldb_get_event_context: struct tevent_context *(struct ldb_context *)
ldb_get_flags: unsigned int (struct ldb_context *)
ldb_get_opaque: void *(struct ldb_context *, const char *)
ldb_get_root_basedn: struct ldb_dn *(struct ldb_context *)
ldb_get_schema_basedn: struct ldb_dn *(struct ldb_context *)
ldb_global_init: int (void)
ldb_handle_new: struct ldb_handle *(TALLOC_CTX *, struct ldb_context *)
ldb_handler_copy: int (struct ldb_context *, void *, const struct ldb_val *, struct ldb_val *)
ldb_handler_fold: int (struct ldb_context *, void *, const struct ldb_val *, struct ldb_val *)
ldb_init: struct ldb_context *(TALLOC_CTX *, struct tevent_context *)
ldb_init_module_chain: int (struct ldb_context *, struct ldb_module *)
ldb_ldif_message_string: char *(struct ldb_context *, TALLOC_CTX *, enum ldb_changetype, const struct ldb_message *)
ldb_ldif_read: struct ldb_ldif *(struct ldb_context *, int (*)(void *), void *)
ldb_ldif_read_file: struct ldb_ldif *(struct ldb_context *, FILE *)
ldb_ldif_read_free: void (struct ldb_context *, struct ldb_ldif *)
ldb_ldif_read_string: struct ldb_ldif *(struct ldb_context *, const char **)
ldb_ldif_write: int (struct ldb_context *, int (*)(void *, const char *, ...), void *, const struct ldb_ldif *)
ldb_ldif_write_file: int (struct ldb_context *, FILE *, const struct ldb_ldif *)
ldb_ldif_write_string: char *(struct ldb_context *, TALLOC_CTX *, const struct ldb_ldif *)
ldb_load_modules: int (struct ldb_context *, const char **)
ldb_load_modules_list: int (struct ldb_context *, const char **, struct ldb_module *, struct ldb_module **)
ldb_map_init: int (struct ldb_module *, const struct ldb_map_attribute *, const struct ldb_map_objectclass *, const char * const *, const char *, const char *)
ldb_match_msg: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, struct ldb_dn *, enum ldb_scope)
ldb_match_msg_error: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, struct ldb_dn *, enum ldb_scope, bool *)
ldb_match_msg_objectclass: int (const struct ldb_message *, const char *)
ldb_mod_register_control: int (struct ldb_module *, const char *)
ldb_modify: int (struct ldb_context *, const struct ldb_message *)
ldb_modify_default_callback: int (struct ldb_request *, struct ldb_reply *)
ldb_module_done: int (struct ldb_request *, struct ldb_control **, struct ldb_extended *, int)
ldb_module_get_ctx: struct ldb_context *(struct ldb_module *)
ldb_module_get_name: const char *(struct ldb_module *)
ldb_module_get_ops: const struct ldb_module_ops *(struct ldb_module *)
ldb_module_get_private: void *(struct ldb_module *)
ldb_module_new: struct ldb_module *(TALLOC_CTX *, struct ldb_context *, const char *, const struct ldb_module_ops *)
ldb_module_send_entry: int (struct ldb_request *, struct ldb_message *, struct ldb_control **)
ldb_module_send_referral: int (struct ldb_request *, char *)
ldb_module_set_private: void (struct ldb_module *, void *)
ldb_modules_hook: int (struct ldb_context *, enum ldb_module_hook_type)
ldb_modules_list_from_string: const char **(struct ldb_context *, TALLOC_CTX *, const char *)
ldb_modules_load: int (const char *, const char *)
ldb_msg_add: int (struct ldb_message *, const struct ldb_message_element *, int)
ldb_msg_add_empty: int (struct ldb_message *, const char *, int, struct ldb_message_element **)
ldb_msg_add_fmt: int (struct ldb_message *, const char *, const char *, ...)
ldb_msg_add_linearized_dn: int (struct ldb_message *, const char *, struct ldb_dn *)
ldb_msg_add_steal_string: int (struct ldb_message *, const char *, char *)
ldb_msg_add_steal_value: int (struct ldb_message *, const char *, struct ldb_val *)
ldb_msg_add_string: int (struct ldb_message *, const char *, const char *)
ldb_msg_add_value: int (struct ldb_message *, const char *, const struct ldb_val *, struct ldb_message_element **)
ldb_msg_canonicalize: struct ldb_message *(struct ldb_context *, const struct ldb_message *)
ldb_msg_check_string_attribute: int (const struct ldb_message *, const char *, const char *)
ldb_msg_copy: struct ldb_message *(TALLOC_CTX *, const struct ldb_message *)
ldb_msg_copy_attr: int (struct ldb_message *, const char *, const char *)
ldb_msg_copy_shallow: struct ldb_message *(TALLOC_CTX *, const struct ldb_message *)
ldb_msg_diff: struct ldb_message *(struct ldb_context *, struct ldb_message *, struct ldb_message *)
ldb_msg_difference: int (struct ldb_context *, TALLOC_CTX *, struct ldb_message *, struct ldb_message *, struct ldb_message **)
ldb_msg_element_compare: int (struct ldb_message_element *, struct ldb_message_element *)
ldb_msg_element_compare_name: int (struct ldb_message_element *, struct ldb_message_element *)
ldb_msg_find_attr_as_bool: int (const struct ldb_message *, const char *, int)
ldb_msg_find_attr_as_dn: struct ldb_dn *(struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, const char *)
ldb_msg_find_attr_as_double: double (const struct ldb_message *, const char *, double)
ldb_msg_find_attr_as_int: int (const struct ldb_message *, const char *, int)
ldb_msg_find_attr_as_int64: int64_t (const struct ldb_message *, const char *, int64_t)
ldb_msg_find_attr_as_string: const char *(const struct ldb_message *, const char *, const char *)
ldb_msg_find_attr_as_uint: unsigned int (const struct ldb_message *, const char *, unsigned int)
ldb_msg_find_attr_as_uint64: uint64_t (const struct ldb_message *, const char *, uint64_t)
ldb_msg_find_element: struct ldb_message_element *(const struct ldb_message *, const char *)
ldb_msg_find_ldb_val: const struct ldb_val *(const struct ldb_message *, const char *)
ldb_msg_find_val: struct ldb_val *(const struct ldb_message_element *, struct ldb_val *)
ldb_msg_new: struct ldb_message *(TALLOC_CTX *)
ldb_msg_normalize: int (struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_message **)
ldb_msg_remove_attr: void (struct ldb_message *, const char *)
ldb_msg_remove_element: void (struct ldb_message *, struct ldb_message_element *)
ldb_msg_rename_attr: int (struct ldb_message *, const char *, const char *)
ldb_msg_sanity_check: int (struct ldb_context *, const struct ldb_message *)
ldb_msg_sort_elements: void (struct ldb_message *)
ldb_next_del_trans: int (struct ldb_module *)
ldb_next_end_trans: int (struct ldb_module *)
ldb_next_init: int (struct ldb_module *)
ldb_next_prepare_commit: int (struct ldb_module *)
ldb_next_remote_request: int (struct ldb_module *, struct ldb_request *)
ldb_next_request: int (struct ldb_module *, struct ldb_request *)
ldb_next_start_trans: int (struct ldb_module *)
ldb_op_default_callback: int (struct ldb_request *, struct ldb_reply *)
ldb_options_find: const char *(struct ldb_context *, const char **, const char *)
ldb_paged_results_init: int (const char *)
ldb_paged_searches_init: int (const char *)
ldb_parse_control_strings: struct ldb_control **(struct ldb_context *, TALLOC_CTX *, const char **)
ldb_parse_tree: struct ldb_parse_tree *(TALLOC_CTX *, const char *)
ldb_parse_tree_attr_replace: void (struct ldb_parse_tree *, const char *, const char *)
ldb_parse_tree_copy_shallow: struct ldb_parse_tree *(TALLOC_CTX *, const struct ldb_parse_tree *)
ldb_qsort: void (void * const, size_t, size_t, void *, ldb_qsort_cmp_fn_t)
ldb_rdn_name_init: int (const char *)
ldb_register_backend: int (const char *, ldb_connect_fn, bool)
ldb_register_hook: int (ldb_hook_fn)
ldb_register_module: int (const struct ldb_module_ops *)
ldb_rename: int (struct ldb_context *, struct ldb_dn *, struct ldb_dn *)
ldb_reply_add_control: int (struct ldb_reply *, const char *, bool, void *)
ldb_reply_get_control: struct ldb_control *(struct ldb_reply *, const char *)
ldb_req_is_untrusted: bool (struct ldb_request *)
ldb_req_location: const char *(struct ldb_request *)
ldb_req_mark_untrusted: void (struct ldb_request *)
ldb_req_set_location: void (struct ldb_request *, const char *)
ldb_request: int (struct ldb_context *, struct ldb_request *)
ldb_request_add_control: int (struct ldb_request *, const char *, bool, void *)
ldb_request_done: int (struct ldb_request *, int)
ldb_request_get_control: struct ldb_control *(struct ldb_request *, const char *)
ldb_request_get_status: int (struct ldb_request *)
ldb_request_replace_control: int (struct ldb_request *, const char *, bool, void *)
ldb_request_set_state: void (struct ldb_request *, int)
ldb_reset_err_string: void (struct ldb_context *)
ldb_sample_init: int (const char *)
ldb_schema_attribute_add: int (struct ldb_context *, const char *, unsigned int, const char *)
ldb_schema_attribute_add_with_syntax: int (struct ldb_context *, const char *, unsigned int, const struct ldb_schema_syntax *)
ldb_schema_attribute_by_name: const struct ldb_schema_attribute *(struct ldb_context *, const char *)
ldb_schema_attribute_remove: void (struct ldb_context *, const char *)
ldb_schema_attribute_set_override_handler: void (struct ldb_context *, ldb_attribute_handler_override_fn_t, void *)
ldb_search: int (struct ldb_context *, TALLOC_CTX *, struct ldb_result **, struct ldb_dn *, enum ldb_scope, const char * const *, const char *, ...)
ldb_search_default_callback: int (struct ldb_request *, struct ldb_reply *)
ldb_sequence_number: int (struct ldb_context *, enum ldb_sequence_type, uint64_t *)
ldb_server_sort_init: int (const char *)
ldb_set_create_perms: void (struct ldb_context *, unsigned int)
ldb_set_debug: int (struct ldb_context *, void (*)(void *, enum ldb_debug_level, const char *, va_list), void *)
ldb_set_debug_stderr: int (struct ldb_context *)
ldb_set_default_dns: void (struct ldb_context *)
ldb_set_errstring: void (struct ldb_context *, const char *)
ldb_set_event_context: void (struct ldb_context *, struct tevent_context *)
ldb_set_flags: void (struct ldb_context *, unsigned int)
ldb_set_modules_dir: void (struct ldb_context *, const char *)
ldb_set_opaque: int (struct ldb_context *, const char *, void *)
ldb_set_timeout: int (struct ldb_context *, struct ldb_request *, int)
ldb_set_timeout_from_prev_req: int (struct ldb_context *, struct ldb_request *, struct ldb_request *)
ldb_set_utf8_default: void (struct ldb_context *)
ldb_set_utf8_fns: void (struct ldb_context *, void *, char *(*)(void *, void *, const char *, size_t))
ldb_setup_wellknown_attributes: int (struct ldb_context *)
ldb_should_b64_encode: int (struct ldb_context *, const struct ldb_val *)
ldb_skel_init: int (const char *)
ldb_standard_syntax_by_name: const struct ldb_schema_syntax *(struct ldb_context *, const char *)
ldb_strerror: const char *(int)
ldb_string_to_time: time_t (const char *)
ldb_string_utc_to_time: time_t (const char *)
ldb_tdb_init: int (const char *)
ldb_timestring: char *(TALLOC_CTX *, time_t)
ldb_timestring_utc: char *(TALLOC_CTX *, time_t)
ldb_transaction_cancel: int (struct ldb_context *)
ldb_transaction_cancel_noerr: int (struct ldb_context *)
ldb_transaction_commit: int (struct ldb_context *)
ldb_transaction_prepare_commit: int (struct ldb_context *)
ldb_transaction_start: int (struct ldb_context *)
ldb_val_dup: struct ldb_val (TALLOC_CTX *, const struct ldb_val *)
ldb_val_equal_exact: int (const struct ldb_val *, const struct ldb_val *)
ldb_val_map_local: struct ldb_val (struct ldb_module *, void *, const struct ldb_map_attribute *, const struct ldb_val *)
ldb_val_map_remote: struct ldb_val (struct ldb_module *, void *, const struct ldb_map_attribute *, const struct ldb_val *)
ldb_val_to_time: int (const struct ldb_val *, time_t *)
ldb_valid_attr_name: int (const char *)
ldb_wait: int (struct ldb_handle *, enum ldb_wait_type)

View File

@ -4,13 +4,6 @@
a temporary includes file until I work on the ldb build system
*/
#if (_SAMBA_BUILD_ <= 3)
/* allow forbidden string functions - should be replaced with _m functions */
#undef strcasecmp
#undef strncasecmp
#define dyn_MODULESDIR dyn_LIBDIR
#endif
#include "replace.h"
#include "system/filesys.h"
#include "system/time.h"

View File

@ -125,6 +125,8 @@ struct ldb_context {
bool prepare_commit_done;
char *partial_debug;
struct poptOption *popt_options;
};
/* The following definitions come from lib/ldb/common/ldb.c */

View File

@ -21,26 +21,17 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#if (_SAMBA_BUILD_ >= 4)
#include "includes.h"
#include "lib/cmdline/popt_common.h"
#include "auth/gensec/gensec.h"
#include "auth/auth.h"
#include "param/param.h"
#include "dsdb/samdb/samdb.h"
#include "ldb_wrap.h"
#else
#include "ldb_includes.h"
#include "ldb_private.h"
#include "ldb.h"
#endif
#include "ldb_module.h"
#include "tools/cmdline.h"
static struct ldb_cmdline options; /* needs to be static for older compilers */
enum ldb_cmdline_options { CMDLINE_RELAX=1 };
static struct poptOption popt_options[] = {
static struct poptOption builtin_popt_options[] = {
POPT_AUTOHELP
{ "url", 'H', POPT_ARG_STRING, &options.url, 0, "database URL", "URL" },
{ "basedn", 'b', POPT_ARG_STRING, &options.basedn, 0, "base DN", "DN" },
@ -67,19 +58,13 @@ static struct poptOption popt_options[] = {
{ "relax", 0, POPT_ARG_NONE, NULL, CMDLINE_RELAX, "pass relax control", NULL },
{ "cross-ncs", 0, POPT_ARG_NONE, NULL, 'N', "search across NC boundaries", NULL },
{ "extended-dn", 0, POPT_ARG_NONE, NULL, 'E', "show extended DNs", NULL },
#if (_SAMBA_BUILD_ >= 4)
POPT_COMMON_SAMBA
POPT_COMMON_CREDENTIALS
POPT_COMMON_CONNECTION
POPT_COMMON_VERSION
#endif
{ NULL }
};
void ldb_cmdline_help(const char *cmdname, FILE *f)
void ldb_cmdline_help(struct ldb_context *ldb, const char *cmdname, FILE *f)
{
poptContext pc;
pc = poptGetContext(cmdname, 0, NULL, popt_options,
pc = poptGetContext(cmdname, 0, NULL, ldb->popt_options,
POPT_CONTEXT_KEEP_FIRST);
poptPrintHelp(pc, f, 0);
}
@ -108,24 +93,14 @@ static bool add_control(TALLOC_CTX *mem_ctx, const char *control)
*/
struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb,
int argc, const char **argv,
void (*usage)(void))
void (*usage)(struct ldb_context *))
{
struct ldb_cmdline *ret=NULL;
poptContext pc;
#if (_SAMBA_BUILD_ >= 4)
int r;
#endif
int num_options = 0;
int opt;
int flags = 0;
#if (_SAMBA_BUILD_ >= 4)
r = ldb_register_samba_handlers(ldb);
if (r != LDB_SUCCESS) {
goto failed;
}
#endif
int rc;
/* make the ldb utilities line buffered */
setlinebuf(stdout);
@ -152,7 +127,15 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb,
options.scope = LDB_SCOPE_DEFAULT;
pc = poptGetContext(argv[0], argc, argv, popt_options,
ldb->popt_options = builtin_popt_options;
rc = ldb_modules_hook(ldb, LDB_MODULE_HOOK_CMDLINE_OPTIONS);
if (rc != LDB_SUCCESS) {
fprintf(stderr, "ldb: failed to run command line hooks : %s\n", ldb_strerror(rc));
goto failed;
}
pc = poptGetContext(argv[0], argc, argv, ldb->popt_options,
POPT_CONTEXT_KEEP_FIRST);
while((opt = poptGetNextOpt(pc)) != -1) {
@ -262,7 +245,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb,
default:
fprintf(stderr, "Invalid option %s: %s\n",
poptBadOption(pc, 0), poptStrerror(opt));
if (usage) usage();
if (usage) usage(ldb);
goto failed;
}
}
@ -279,7 +262,7 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb,
/* all utils need some option */
if (ret->url == NULL) {
fprintf(stderr, "You must supply a url with -H or with $LDB_URL\n");
if (usage) usage();
if (usage) usage(ldb);
goto failed;
}
@ -299,27 +282,16 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb,
flags |= LDB_FLG_ENABLE_TRACING;
}
#if (_SAMBA_BUILD_ >= 4)
/* Must be after we have processed command line options */
gensec_init(cmdline_lp_ctx);
if (ldb_set_opaque(ldb, "sessionInfo", system_session(cmdline_lp_ctx))) {
goto failed;
}
if (ldb_set_opaque(ldb, "credentials", cmdline_credentials)) {
goto failed;
}
if (ldb_set_opaque(ldb, "loadparm", cmdline_lp_ctx)) {
goto failed;
}
ldb_set_utf8_fns(ldb, NULL, wrap_casefold);
#endif
if (options.modules_path != NULL) {
ldb_set_modules_dir(ldb, options.modules_path);
}
rc = ldb_modules_hook(ldb, LDB_MODULE_HOOK_CMDLINE_PRECONNECT);
if (rc != LDB_SUCCESS) {
fprintf(stderr, "ldb: failed to run preconnect hooks : %s\n", ldb_strerror(rc));
goto failed;
}
/* now connect to the ldb */
if (ldb_connect(ldb, ret->url, flags, ret->options) != 0) {
fprintf(stderr, "Failed to connect to %s - %s\n",
@ -327,10 +299,11 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb,
goto failed;
}
#if (_SAMBA_BUILD_ >= 4)
/* get the domain SID into the cache for SDDL processing */
samdb_domain_sid(ldb);
#endif
rc = ldb_modules_hook(ldb, LDB_MODULE_HOOK_CMDLINE_POSTCONNECT);
if (rc != LDB_SUCCESS) {
fprintf(stderr, "ldb: failed to run post connect hooks : %s\n", ldb_strerror(rc));
goto failed;
}
return ret;

View File

@ -47,9 +47,9 @@ struct ldb_cmdline {
};
struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const char **argv,
void (*usage)(void));
void (*usage)(struct ldb_context *));
int handle_controls_reply(struct ldb_control **reply, struct ldb_control **request);
void ldb_cmdline_help(const char *cmdname, FILE *f);
void ldb_cmdline_help(struct ldb_context *ldb, const char *cmdname, FILE *f);