#include "lib/events/events.h"
#include "libcli/ldap/ldap.h"
#include "libcli/ldap/ldap_client.h"
-#include "lib/cmdline/popt_common.h"
#include "auth/auth.h"
+#include "auth/credentials/credentials.h"
struct ildb_private {
struct ldap_connection *ldap;
- struct ldb_message *rootDSE;
struct ldb_context *ldb;
};
-struct ildb_async_context {
+struct ildb_context {
struct ldb_module *module;
struct ldap_request *req;
void *context;
- int (*callback)(struct ldb_context *, void *, struct ldb_async_result *);
+ int (*callback)(struct ldb_context *, void *, struct ldb_reply *);
};
/*
if (NT_STATUS_IS_OK(status)) {
return LDB_SUCCESS;
}
- talloc_free(ildb->ldb->err_string);
- ildb->ldb->err_string = talloc_strdup(ildb, ldap_errstr(ildb->ldap, status));
+ ldb_set_errstring(ildb->ldb, ldap_errstr(ildb->ldap, status));
if (NT_STATUS_IS_LDAP(status)) {
return NT_STATUS_LDAP_CODE(status);
}
static void ildb_request_timeout(struct event_context *ev, struct timed_event *te,
struct timeval t, void *private_data)
{
- struct ldb_async_handle *handle = talloc_get_type(private_data, struct ldb_async_handle);
- struct ildb_async_context *ac = talloc_get_type(handle->private_data, struct ildb_async_context);
+ struct ldb_handle *handle = talloc_get_type(private_data, struct ldb_handle);
+ struct ildb_context *ac = talloc_get_type(handle->private_data, struct ildb_context);
if (ac->req->state == LDAP_REQUEST_PENDING) {
DLIST_REMOVE(ac->req->conn->pending, ac->req);
}
- handle->status = LDB_ERR_OPERATIONS_ERROR;
+ handle->status = LDB_ERR_TIME_LIMIT_EXCEEDED;
return;
}
-static void ildb_async_callback(struct ldap_request *req)
+static void ildb_callback(struct ldap_request *req)
{
- struct ldb_async_handle *handle = talloc_get_type(req->async.private_data, struct ldb_async_handle);
- struct ildb_async_context *ac = talloc_get_type(handle->private_data, struct ildb_async_context);
+ struct ldb_handle *handle = talloc_get_type(req->async.private_data, struct ldb_handle);
+ struct ildb_context *ac = talloc_get_type(handle->private_data, struct ildb_context);
struct ildb_private *ildb = talloc_get_type(ac->module->private_data, struct ildb_private);
NTSTATUS status;
int i;
/* loop over all messages */
for (i = 0; i < req->num_replies; i++) {
struct ldap_SearchResEntry *search;
- struct ldb_async_result *ares = NULL;
+ struct ldb_reply *ares = NULL;
struct ldap_message *msg;
int ret;
- ares = talloc_zero(ac, struct ldb_async_result);
+ ares = talloc_zero(ac, struct ldb_reply);
if (!ares) {
handle->status = LDB_ERR_OPERATIONS_ERROR;
return;
status = ldap_check_response(req->conn, &msg->r.GeneralResult);
if (!NT_STATUS_IS_OK(status)) {
- ldb_debug(ac->module->ldb, LDB_DEBUG_ERROR, "Error: %s\n" ,ldap_errstr(req->conn, status));
handle->status = ildb_map_error(ildb, status);
return;
}
- if (msg->controls) {
- ares->controls = talloc_steal(ares, msg->controls);
- }
+ ares->controls = talloc_move(ares, &msg->controls);
if (msg->r.SearchResultDone.resultcode) {
if (msg->r.SearchResultDone.errormessage) {
- ldb_set_errstring(ac->module->ldb, talloc_strdup(ac->module, msg->r.SearchResultDone.errormessage));
+ ldb_set_errstring(ac->module->ldb, msg->r.SearchResultDone.errormessage);
}
}
ares->message = ldb_msg_new(ares);
if (!ares->message) {
- handle->status = LDB_ERR_OPERATIONS_ERROR;;
+ handle->status = LDB_ERR_OPERATIONS_ERROR;
return;
}
search = &(msg->r.SearchResultEntry);
- ares->message->dn = ldb_dn_explode_or_special(ares->message, search->dn);
- if (ares->message->dn == NULL) {
+ ares->message->dn = ldb_dn_new(ares->message, ac->module->ldb, search->dn);
+ if ( ! ldb_dn_validate(ares->message->dn)) {
handle->status = LDB_ERR_OPERATIONS_ERROR;
return;
}
ares->message->num_elements = search->num_attributes;
- ares->message->elements = talloc_steal(ares->message, search->attributes);
+ ares->message->elements = talloc_move(ares->message,
+ &search->attributes);
handle->status = LDB_SUCCESS;
handle->state = LDB_ASYNC_PENDING;
}
}
-static int ildb_request_send(struct ldb_module *module, struct ldap_message *msg,
- void *context,
- int (*callback)(struct ldb_context *, void *, struct ldb_async_result *),
- int timeout,
- struct ldb_async_handle **handle)
+static struct ldb_handle *init_ildb_handle(struct ldb_module *module,
+ void *context,
+ int (*callback)(struct ldb_context *, void *, struct ldb_reply *))
{
struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
- struct ildb_async_context *ildb_ac;
- struct ldb_async_handle *h;
- struct ldap_request *req;
+ struct ildb_context *ildb_ac;
+ struct ldb_handle *h;
- h = talloc_zero(ildb->ldap, struct ldb_async_handle);
+ h = talloc_zero(ildb->ldap, struct ldb_handle);
if (h == NULL) {
- ldb_set_errstring(module->ldb, talloc_asprintf(module, "Out of Memory"));
- return LDB_ERR_OPERATIONS_ERROR;
+ ldb_set_errstring(module->ldb, "Out of Memory");
+ return NULL;
}
h->module = module;
- ildb_ac = talloc(h, struct ildb_async_context);
+ ildb_ac = talloc(h, struct ildb_context);
if (ildb_ac == NULL) {
- ldb_set_errstring(module->ldb, talloc_asprintf(module, "Out of Memory"));
+ ldb_set_errstring(module->ldb, "Out of Memory");
talloc_free(h);
- return LDB_ERR_OPERATIONS_ERROR;
+ return NULL;
}
h->private_data = (void *)ildb_ac;
h->state = LDB_ASYNC_INIT;
h->status = LDB_SUCCESS;
+ ildb_ac->module = module;
+ ildb_ac->context = context;
+ ildb_ac->callback = callback;
+
+ return h;
+}
+
+static int ildb_request_send(struct ldb_module *module, struct ldap_message *msg,
+ void *context,
+ int (*callback)(struct ldb_context *, void *, struct ldb_reply *),
+ int timeout,
+ struct ldb_handle **handle)
+{
+ struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
+ struct ldb_handle *h = init_ildb_handle(module, context, callback);
+ struct ildb_context *ildb_ac;
+ struct ldap_request *req;
+
+ if (!h) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ ildb_ac = talloc_get_type(h->private_data, struct ildb_context);
+
req = ldap_request_send(ildb->ldap, msg);
if (req == NULL) {
- ldb_set_errstring(module->ldb, talloc_asprintf(module, "async send request failed"));
+ ldb_set_errstring(module->ldb, "async send request failed");
return LDB_ERR_OPERATIONS_ERROR;
}
- ildb_ac->req = talloc_steal(ildb_ac, req);
- ildb_ac->module = module;
- ildb_ac->context = context;
- ildb_ac->callback = callback;
-
- req->async.fn = ildb_async_callback;
- req->async.private_data = (void *)h;
+ if (!req->conn) {
+ ldb_set_errstring(module->ldb, "connection to remote LDAP server dropped?");
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
talloc_free(req->time_event);
req->time_event = NULL;
if (timeout) {
req->time_event = event_add_timed(req->conn->event.event_ctx, h,
timeval_current_ofs(timeout, 0),
- ildb_request_timeout, ildb_ac);
+ ildb_request_timeout, h);
}
- *handle = h;
+ req->async.fn = ildb_callback;
+ req->async.private_data = (void *)h;
+ ildb_ac->req = talloc_move(ildb_ac, &req);
+ *handle = h;
return LDB_SUCCESS;
+}
+static int ildb_request_noop(struct ldb_module *module, struct ldb_request *req)
+{
+ struct ldb_handle *h = init_ildb_handle(module, req->context, req->callback);
+ struct ildb_context *ildb_ac;
+ int ret = LDB_SUCCESS;
+
+ if (!h) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ ildb_ac = talloc_get_type(h->private_data, struct ildb_context);
+
+ req->handle = h;
+
+ if (ildb_ac->callback) {
+ ret = ildb_ac->callback(module->ldb, ildb_ac->context, NULL);
+ }
+ req->handle->state = LDB_ASYNC_DONE;
+ return ret;
}
/*
search for matching records using an asynchronous function
*/
-static int ildb_search_async(struct ldb_module *module, const struct ldb_dn *base,
- enum ldb_scope scope, struct ldb_parse_tree *tree,
- const char * const *attrs,
- struct ldb_control **control_req,
- void *context,
- int (*callback)(struct ldb_context *, void *, struct ldb_async_result *),
- int timeout,
- struct ldb_async_handle **handle)
+static int ildb_search(struct ldb_module *module, struct ldb_request *req)
{
struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
struct ldap_message *msg;
int n;
- *handle = NULL;
+ req->handle = NULL;
- if (!callback || !context) {
- ldb_set_errstring(module->ldb, talloc_asprintf(module, "Async interface called with NULL callback function or NULL context"));
+ if (!req->callback || !req->context) {
+ ldb_set_errstring(module->ldb, "Async interface called with NULL callback function or NULL context");
return LDB_ERR_OPERATIONS_ERROR;
}
- if (tree == NULL) {
- ldb_set_errstring(module->ldb, talloc_asprintf(module, "Invalid expression parse tree"));
+ if (req->op.search.tree == NULL) {
+ ldb_set_errstring(module->ldb, "Invalid expression parse tree");
return LDB_ERR_OPERATIONS_ERROR;
}
msg = new_ldap_message(ildb);
if (msg == NULL) {
- ldb_set_errstring(module->ldb, talloc_asprintf(module, "Out of Memory"));
+ ldb_set_errstring(module->ldb, "Out of Memory");
return LDB_ERR_OPERATIONS_ERROR;
}
msg->type = LDAP_TAG_SearchRequest;
- if (base == NULL) {
- if (ildb->rootDSE != NULL) {
- msg->r.SearchRequest.basedn =
- talloc_strdup(msg, ldb_msg_find_string(ildb->rootDSE, "defaultNamingContext", ""));
- } else {
- msg->r.SearchRequest.basedn = talloc_strdup(msg, "");
- }
+ if (req->op.search.base == NULL) {
+ msg->r.SearchRequest.basedn = talloc_strdup(msg, "");
} else {
- msg->r.SearchRequest.basedn = ldb_dn_linearize(msg, base);
+ msg->r.SearchRequest.basedn = ldb_dn_alloc_linearized(msg, req->op.search.base);
}
if (msg->r.SearchRequest.basedn == NULL) {
- ldb_set_errstring(module->ldb, talloc_asprintf(module, "Unable to determine baseDN"));
+ ldb_set_errstring(module->ldb, "Unable to determine baseDN");
talloc_free(msg);
return LDB_ERR_OPERATIONS_ERROR;
}
- if (scope == LDB_SCOPE_DEFAULT) {
+ if (req->op.search.scope == LDB_SCOPE_DEFAULT) {
msg->r.SearchRequest.scope = LDB_SCOPE_SUBTREE;
} else {
- msg->r.SearchRequest.scope = scope;
+ msg->r.SearchRequest.scope = req->op.search.scope;
}
msg->r.SearchRequest.deref = LDAP_DEREFERENCE_NEVER;
msg->r.SearchRequest.timelimit = 0;
msg->r.SearchRequest.sizelimit = 0;
msg->r.SearchRequest.attributesonly = 0;
- msg->r.SearchRequest.tree = tree;
+ msg->r.SearchRequest.tree = discard_const(req->op.search.tree);
- for (n = 0; attrs && attrs[n]; n++) /* noop */ ;
+ for (n = 0; req->op.search.attrs && req->op.search.attrs[n]; n++) /* noop */ ;
msg->r.SearchRequest.num_attributes = n;
- msg->r.SearchRequest.attributes = discard_const(attrs);
- msg->controls = control_req;
-
- return ildb_request_send(module, msg, context, callback, timeout, handle);
-}
-
-static int ildb_search_sync_callback(struct ldb_context *ldb, void *context, struct ldb_async_result *ares)
-{
- struct ldb_result *res;
- int n;
-
- if (!context) {
- ldb_set_errstring(ldb, talloc_asprintf(ldb, "NULL Context in callback"));
- return LDB_ERR_OPERATIONS_ERROR;
- }
-
- res = *((struct ldb_result **)context);
-
- if (!res || !ares) {
- goto error;
- }
-
- if (ares->type == LDB_REPLY_ENTRY) {
- res->msgs = talloc_realloc(res, res->msgs, struct ldb_message *, res->count + 2);
- if (! res->msgs) {
- goto error;
- }
-
- res->msgs[res->count + 1] = NULL;
-
- res->msgs[res->count] = talloc_steal(res->msgs, ares->message);
- if (! res->msgs[res->count]) {
- goto error;
- }
-
- res->count++;
- }
-
- if (ares->type == LDB_REPLY_REFERRAL) {
- if (res->refs) {
- for (n = 0; res->refs[n]; n++) /*noop*/ ;
- } else {
- n = 0;
- }
-
- res->refs = talloc_realloc(res, res->refs, char *, n + 2);
- if (! res->refs) {
- goto error;
- }
-
- res->refs[n] = talloc_steal(res->refs, ares->referral);
- res->refs[n + 1] = NULL;
- }
-
- if (ares->controls) {
- res->controls = talloc_steal(res, ares->controls);
- if (! res->controls) {
- goto error;
- }
- }
-
- talloc_free(ares);
- return LDB_SUCCESS;
-
-error:
- talloc_free(ares);
- talloc_free(res);
- *((struct ldb_result **)context) = NULL;
- return LDB_ERR_OPERATIONS_ERROR;
-}
-
-/*
- search for matching records using a synchronous function
- */
-static int ildb_search_bytree(struct ldb_module *module, const struct ldb_dn *base,
- enum ldb_scope scope, struct ldb_parse_tree *tree,
- const char * const *attrs,
- struct ldb_control **control_req,
- struct ldb_result **res)
-{
- struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
- struct ldb_async_handle *handle;
- int ret;
-
- *res = talloc_zero(ildb, struct ldb_result);
- if (! *res) {
- return LDB_ERR_OPERATIONS_ERROR;
- }
-
- ret = ildb_search_async(module, base, scope, tree, attrs, control_req,
- res, &ildb_search_sync_callback, ildb->ldap->timeout, &handle);
+ msg->r.SearchRequest.attributes = discard_const(req->op.search.attrs);
+ msg->controls = req->controls;
- if (ret == LDB_SUCCESS) {
- ret = ldb_async_wait(handle, LDB_WAIT_ALL);
- talloc_free(handle);
- }
-
- if (ret != LDB_SUCCESS) {
- talloc_free(*res);
- }
-
- return ret;
+ return ildb_request_send(module, msg, req->context, req->callback, req->timeout, &(req->handle));
}
/*
add a record
*/
-static int ildb_add_async(struct ldb_module *module, const struct ldb_message *ldb_msg,
- void *context,
- int (*callback)(struct ldb_context *, void *, struct ldb_async_result *),
- int timeout,
- struct ldb_async_handle **handle)
+static int ildb_add(struct ldb_module *module, struct ldb_request *req)
{
struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
struct ldap_message *msg;
struct ldap_mod **mods;
int i,n;
- *handle = NULL;
+ req->handle = NULL;
/* ignore ltdb specials */
- if (ldb_dn_is_special(ldb_msg->dn)) {
- return LDB_SUCCESS;
+ if (ldb_dn_is_special(req->op.add.message->dn)) {
+ return ildb_request_noop(module, req);
}
msg = new_ldap_message(ildb->ldap);
msg->type = LDAP_TAG_AddRequest;
- msg->r.AddRequest.dn = ldb_dn_linearize(msg, ldb_msg->dn);
+ msg->r.AddRequest.dn = ldb_dn_alloc_linearized(msg, req->op.add.message->dn);
if (msg->r.AddRequest.dn == NULL) {
talloc_free(msg);
return LDB_ERR_INVALID_DN_SYNTAX;
}
- mods = ildb_msg_to_mods(msg, &n, ldb_msg, 0);
+ mods = ildb_msg_to_mods(msg, &n, req->op.add.message, 0);
if (mods == NULL) {
talloc_free(msg);
return LDB_ERR_OPERATIONS_ERROR;
msg->r.AddRequest.attributes[i] = mods[i]->attrib;
}
- return ildb_request_send(module, msg, context, callback, timeout, handle);
-}
-
-static int ildb_add(struct ldb_module *module, const struct ldb_message *msg)
-{
- struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
- struct ldb_async_handle *handle;
- int ret;
-
- ret = ildb_add_async(module, msg,
- NULL, NULL, ildb->ldap->timeout, &handle);
-
- if (ret != LDB_SUCCESS)
- return ret;
-
- ret = ldb_async_wait(handle, LDB_WAIT_ALL);
-
- talloc_free(handle);
- return ret;
+ return ildb_request_send(module, msg, req->context, req->callback, req->timeout, &(req->handle));
}
/*
modify a record
*/
-static int ildb_modify_async(struct ldb_module *module, const struct ldb_message *ldb_msg,
- void *context,
- int (*callback)(struct ldb_context *, void *, struct ldb_async_result *),
- int timeout,
- struct ldb_async_handle **handle)
+static int ildb_modify(struct ldb_module *module, struct ldb_request *req)
{
struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
struct ldap_message *msg;
struct ldap_mod **mods;
int i,n;
- *handle = NULL;
+ req->handle = NULL;
/* ignore ltdb specials */
- if (ldb_dn_is_special(ldb_msg->dn)) {
- return LDB_SUCCESS;
+ if (ldb_dn_is_special(req->op.mod.message->dn)) {
+ return ildb_request_noop(module, req);
}
msg = new_ldap_message(ildb->ldap);
msg->type = LDAP_TAG_ModifyRequest;
- msg->r.ModifyRequest.dn = ldb_dn_linearize(msg, ldb_msg->dn);
+ msg->r.ModifyRequest.dn = ldb_dn_alloc_linearized(msg, req->op.mod.message->dn);
if (msg->r.ModifyRequest.dn == NULL) {
talloc_free(msg);
return LDB_ERR_INVALID_DN_SYNTAX;
}
- mods = ildb_msg_to_mods(msg, &n, ldb_msg, 1);
+ mods = ildb_msg_to_mods(msg, &n, req->op.mod.message, 1);
if (mods == NULL) {
talloc_free(msg);
return LDB_ERR_OPERATIONS_ERROR;
msg->r.ModifyRequest.mods[i] = *mods[i];
}
- return ildb_request_send(module, msg, context, callback, timeout, handle);
-}
-
-static int ildb_modify(struct ldb_module *module, const struct ldb_message *msg)
-{
- struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
- struct ldb_async_handle *handle;
- int ret;
-
- ret = ildb_modify_async(module, msg,
- NULL, NULL, ildb->ldap->timeout, &handle);
-
- if (ret != LDB_SUCCESS)
- return ret;
-
- ret = ldb_async_wait(handle, LDB_WAIT_ALL);
-
- talloc_free(handle);
- return ret;
+ return ildb_request_send(module, msg, req->context, req->callback, req->timeout, &(req->handle));
}
/*
delete a record
*/
-static int ildb_delete_async(struct ldb_module *module, const struct ldb_dn *dn,
- void *context,
- int (*callback)(struct ldb_context *, void *, struct ldb_async_result *),
- int timeout,
- struct ldb_async_handle **handle)
+static int ildb_delete(struct ldb_module *module, struct ldb_request *req)
{
struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
struct ldap_message *msg;
- *handle = NULL;
+ req->handle = NULL;
/* ignore ltdb specials */
- if (ldb_dn_is_special(dn)) {
- return LDB_SUCCESS;
+ if (ldb_dn_is_special(req->op.del.dn)) {
+ return ildb_request_noop(module, req);
}
msg = new_ldap_message(ildb->ldap);
msg->type = LDAP_TAG_DelRequest;
- msg->r.DelRequest.dn = ldb_dn_linearize(msg, dn);
+ msg->r.DelRequest.dn = ldb_dn_alloc_linearized(msg, req->op.del.dn);
if (msg->r.DelRequest.dn == NULL) {
talloc_free(msg);
return LDB_ERR_INVALID_DN_SYNTAX;
}
- return ildb_request_send(module, msg, context, callback, timeout, handle);
-}
-
-static int ildb_delete(struct ldb_module *module, const struct ldb_dn *dn)
-{
- struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
- struct ldb_async_handle *handle;
- int ret;
-
- ret = ildb_delete_async(module, dn,
- NULL, NULL, ildb->ldap->timeout, &handle);
-
- if (ret != LDB_SUCCESS)
- return ret;
-
- ret = ldb_async_wait(handle, LDB_WAIT_ALL);
-
- talloc_free(handle);
- return ret;
+ return ildb_request_send(module, msg, req->context, req->callback, req->timeout, &(req->handle));
}
/*
rename a record
*/
-static int ildb_rename_async(struct ldb_module *module,
- const struct ldb_dn *olddn, const struct ldb_dn *newdn,
- void *context,
- int (*callback)(struct ldb_context *, void *, struct ldb_async_result *),
- int timeout,
- struct ldb_async_handle **handle)
+static int ildb_rename(struct ldb_module *module, struct ldb_request *req)
{
struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
struct ldap_message *msg;
- *handle = NULL;
+ req->handle = NULL;
/* ignore ltdb specials */
- if (ldb_dn_is_special(olddn) || ldb_dn_is_special(newdn)) {
- return LDB_SUCCESS;
+ if (ldb_dn_is_special(req->op.rename.olddn) || ldb_dn_is_special(req->op.rename.newdn)) {
+ return ildb_request_noop(module, req);
}
msg = new_ldap_message(ildb->ldap);
}
msg->type = LDAP_TAG_ModifyDNRequest;
- msg->r.ModifyDNRequest.dn = ldb_dn_linearize(msg, olddn);
+ msg->r.ModifyDNRequest.dn = ldb_dn_alloc_linearized(msg, req->op.rename.olddn);
if (msg->r.ModifyDNRequest.dn == NULL) {
talloc_free(msg);
return LDB_ERR_INVALID_DN_SYNTAX;
msg->r.ModifyDNRequest.newrdn =
talloc_asprintf(msg, "%s=%s",
- newdn->components[0].name,
- ldb_dn_escape_value(msg, newdn->components[0].value));
+ ldb_dn_get_rdn_name(req->op.rename.newdn),
+ ldb_dn_escape_value(msg, *ldb_dn_get_rdn_val(req->op.rename.newdn)));
if (msg->r.ModifyDNRequest.newrdn == NULL) {
talloc_free(msg);
return LDB_ERR_OPERATIONS_ERROR;
}
msg->r.ModifyDNRequest.newsuperior =
- ldb_dn_linearize(msg,
- ldb_dn_get_parent(msg, newdn));
+ ldb_dn_alloc_linearized(msg, ldb_dn_get_parent(msg, req->op.rename.newdn));
if (msg->r.ModifyDNRequest.newsuperior == NULL) {
talloc_free(msg);
return LDB_ERR_INVALID_DN_SYNTAX;
msg->r.ModifyDNRequest.deleteolddn = True;
- return ildb_request_send(module, msg, context, callback, timeout, handle);
-}
-
-static int ildb_rename(struct ldb_module *module, const struct ldb_dn *olddn, const struct ldb_dn *newdn)
-{
- struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
- struct ldb_async_handle *handle;
- int ret;
-
- ret = ildb_rename_async(module, olddn, newdn,
- NULL, NULL, ildb->ldap->timeout, &handle);
-
- if (ret != LDB_SUCCESS)
- return ret;
-
- ret = ldb_async_wait(handle, LDB_WAIT_ALL);
-
- talloc_free(handle);
- return ret;
+ return ildb_request_send(module, msg, req->context, req->callback, req->timeout, &(req->handle));
}
static int ildb_start_trans(struct ldb_module *module)
{
/* TODO implement a local locking mechanism here */
- return 0;
+ return LDB_SUCCESS;
}
static int ildb_end_trans(struct ldb_module *module)
{
/* TODO implement a local transaction mechanism here */
- return 0;
+ return LDB_SUCCESS;
}
static int ildb_del_trans(struct ldb_module *module)
{
/* TODO implement a local locking mechanism here */
- return 0;
+ return LDB_SUCCESS;
}
static int ildb_request(struct ldb_module *module, struct ldb_request *req)
{
- switch (req->operation) {
-
- case LDB_REQ_SEARCH:
- return ildb_search_bytree(module,
- req->op.search.base,
- req->op.search.scope,
- req->op.search.tree,
- req->op.search.attrs,
- req->controls,
- &req->op.search.res);
-
- case LDB_REQ_ADD:
- return ildb_add(module, req->op.add.message);
-
- case LDB_REQ_MODIFY:
- return ildb_modify(module, req->op.mod.message);
-
- case LDB_REQ_DELETE:
- return ildb_delete(module, req->op.del.dn);
-
- case LDB_REQ_RENAME:
- return ildb_rename(module,
- req->op.rename.olddn,
- req->op.rename.newdn);
-
- case LDB_ASYNC_SEARCH:
- return ildb_search_async(module,
- req->op.search.base,
- req->op.search.scope,
- req->op.search.tree,
- req->op.search.attrs,
- req->controls,
- req->async.context,
- req->async.callback,
- req->async.timeout,
- &req->async.handle);
-
- case LDB_ASYNC_ADD:
- return ildb_add_async(module,
- req->op.add.message,
- req->async.context,
- req->async.callback,
- req->async.timeout,
- &req->async.handle);
-
- case LDB_ASYNC_MODIFY:
- return ildb_modify_async(module,
- req->op.mod.message,
- req->async.context,
- req->async.callback,
- req->async.timeout,
- &req->async.handle);
-
- case LDB_ASYNC_DELETE:
- return ildb_delete_async(module,
- req->op.del.dn,
- req->async.context,
- req->async.callback,
- req->async.timeout,
- &req->async.handle);
-
- case LDB_ASYNC_RENAME:
- return ildb_rename_async(module,
- req->op.rename.olddn,
- req->op.rename.newdn,
- req->async.context,
- req->async.callback,
- req->async.timeout,
- &req->async.handle);
-
- default:
- return -1;
-
- }
+ return LDB_ERR_OPERATIONS_ERROR;
}
-static int ildb_async_wait(struct ldb_async_handle *handle, enum ldb_async_wait_type type)
+static int ildb_wait(struct ldb_handle *handle, enum ldb_wait_type type)
{
- struct ildb_async_context *ac = talloc_get_type(handle->private_data, struct ildb_async_context);
+ struct ildb_context *ac = talloc_get_type(handle->private_data, struct ildb_context);
if (handle->state == LDB_ASYNC_DONE) {
return handle->status;
return handle->status;
}
-/*
- fetch the rootDSE for later use
-*/
-static int ildb_init(struct ldb_module *module)
-{
- struct ildb_private *ildb = talloc_get_type(module->private_data, struct ildb_private);
- struct ldb_result *res = NULL;
- struct ldb_dn *empty_dn = ldb_dn_new(ildb);
- int ret;
- ret = ildb_search_bytree(module, empty_dn, LDB_SCOPE_BASE,
- ldb_parse_tree(empty_dn, "dn=dc=rootDSE"),
- NULL, NULL, &res);
- if (ret == LDB_SUCCESS && res->count == 1) {
- ildb->rootDSE = talloc_steal(ildb, res->msgs[0]);
- }
- if (ret == LDB_SUCCESS) talloc_free(res);
- talloc_free(empty_dn);
-
- return LDB_SUCCESS;
-}
-
static const struct ldb_module_ops ildb_ops = {
.name = "ldap",
+ .search = ildb_search,
+ .add = ildb_add,
+ .modify = ildb_modify,
+ .del = ildb_delete,
+ .rename = ildb_rename,
.request = ildb_request,
.start_transaction = ildb_start_trans,
.end_transaction = ildb_end_trans,
.del_transaction = ildb_del_trans,
- .async_wait = ildb_async_wait,
- .init_context = ildb_init
+ .wait = ildb_wait
};
/*
connect to the database
*/
static int ildb_connect(struct ldb_context *ldb, const char *url,
- unsigned int flags, const char *options[])
+ unsigned int flags, const char *options[],
+ struct ldb_module **module)
{
struct ildb_private *ildb = NULL;
NTSTATUS status;
goto failed;
}
- ildb->rootDSE = NULL;
ildb->ldb = ldb;
- ildb->ldap = ldap_new_connection(ildb, ldb_get_opaque(ldb, "EventContext"));
+ ildb->ldap = ldap4_new_connection(ildb, ldb_get_opaque(ldb, "EventContext"));
if (!ildb->ldap) {
ldb_oom(ldb);
goto failed;
}
+ if (flags & LDB_FLG_RECONNECT) {
+ ldap_set_reconn_params(ildb->ldap, 10);
+ }
+
status = ldap_connect(ildb->ldap, url);
if (!NT_STATUS_IS_OK(status)) {
ldb_debug(ldb, LDB_DEBUG_ERROR, "Failed to connect to ldap URL '%s' - %s\n",
goto failed;
}
- ldb->modules = talloc(ldb, struct ldb_module);
- if (!ldb->modules) {
+
+ *module = talloc(ldb, struct ldb_module);
+ if (!module) {
ldb_oom(ldb);
- goto failed;
+ talloc_free(ildb);
+ return -1;
}
- ldb->modules->ldb = ldb;
- ldb->modules->prev = ldb->modules->next = NULL;
- ldb->modules->private_data = ildb;
- ldb->modules->ops = &ildb_ops;
+ talloc_set_name_const(*module, "ldb_ildap backend");
+ (*module)->ldb = ldb;
+ (*module)->prev = (*module)->next = NULL;
+ (*module)->private_data = ildb;
+ (*module)->ops = &ildb_ops;
/* caller can optionally setup credentials using the opaque token 'credentials' */
creds = talloc_get_type(ldb_get_opaque(ldb, "credentials"), struct cli_credentials);
return 0;
failed:
- if (ldb->modules) {
- ldb->modules->private_data = NULL;
- }
talloc_free(ildb);
return -1;
}
int ldb_ildap_init(void)
{
- return ldb_register_backend("ldap", ildb_connect);
+ return ldb_register_backend("ldap", ildb_connect) +
+ ldb_register_backend("ldapi", ildb_connect) +
+ ldb_register_backend("ldaps", ildb_connect);
}
git.samba.org / kamenim / samba.git / blobdiff