#include "includes.h"
#include "ldap_server/ldap_server.h"
-#include "ldap_parse.h"
-
-/* TODO: samdb_context is not a pulblic struct */
-struct samdb_context {
- struct ldb_context *ldb;
- struct samdb_context **static_ptr;
-};
-
-
-#define ALLOC_CHECK(ptr) do {\
- if (!(ptr)) {\
- return NT_STATUS_NO_MEMORY;\
- }\
-} while(0)
+#include "lib/ldb/include/ldb_errors.h"
+#include "dsdb/samdb/samdb.h"
#define VALID_DN_SYNTAX(dn,i) do {\
if (!(dn)) {\
}\
} while(0)
-static NTSTATUS sldb_Search(struct ldapsrv_partition *partition, struct ldapsrv_call *call,
- struct ldap_SearchRequest *r)
+
+/*
+ map an error code from ldb to ldap
+*/
+static int sldb_map_error(struct ldapsrv_partition *partition, int ldb_ret,
+ const char **errstr)
+{
+ struct ldb_context *samdb = talloc_get_type(partition->private,
+ struct ldb_context);
+ *errstr = ldb_errstring(samdb);
+
+ /* its 1:1 for now */
+ return ldb_ret;
+}
+
+/*
+ connect to the sam database
+*/
+NTSTATUS sldb_Init(struct ldapsrv_partition *partition, struct ldapsrv_connection *conn)
{
+ TALLOC_CTX *mem_ctx = talloc_new(partition);
+ struct ldb_context *ldb;
+ ldb = samdb_connect(mem_ctx, conn->session_info);
+ if (ldb == NULL) {
+ talloc_free(mem_ctx);
+ return NT_STATUS_INTERNAL_DB_CORRUPTION;
+ }
+ talloc_steal(partition, ldb);
+ partition->private = ldb;
+ talloc_free(mem_ctx);
+ return NT_STATUS_OK;
+}
+
+/*
+ Re-connect to the ldb after a bind (this does not handle the bind
+ itself, but just notes the change in credentials)
+*/
+NTSTATUS sldb_Bind(struct ldapsrv_partition *partition, struct ldapsrv_connection *conn)
+{
+ struct ldb_context *samdb = partition->private;
NTSTATUS status;
+ status = sldb_Init(partition, conn);
+ if (NT_STATUS_IS_OK(status)) {
+ /* don't leak the old LDB */
+ talloc_free(samdb);
+ }
+ return status;
+}
+
+static NTSTATUS sldb_Search(struct ldapsrv_partition *partition, struct ldapsrv_call *call,
+ struct ldap_SearchRequest *r)
+{
void *local_ctx;
- struct ldap_dn *basedn;
+ struct ldb_dn *basedn;
struct ldap_Result *done;
struct ldap_SearchResEntry *ent;
struct ldapsrv_reply *ent_r, *done_r;
int result = LDAP_SUCCESS;
- struct samdb_context *samdb;
- struct ldb_message **res;
- int i, j, y, count;
+ struct ldb_context *samdb;
+ struct ldb_result *res = NULL;
+ int i, j, y, ret;
+ int success_limit = 1;
enum ldb_scope scope = LDB_SCOPE_DEFAULT;
const char **attrs = NULL;
const char *errstr = NULL;
+ struct ldb_request lreq;
local_ctx = talloc_named(call, 0, "sldb_Search local memory context");
- ALLOC_CHECK(local_ctx);
+ NT_STATUS_HAVE_NO_MEMORY(local_ctx);
- samdb = samdb_connect(local_ctx);
- ALLOC_CHECK(samdb);
+ samdb = talloc_get_type(partition->private, struct ldb_context);
- basedn = ldap_parse_dn(local_ctx, r->basedn);
- VALID_DN_SYNTAX(basedn,0);
+ basedn = ldb_dn_explode(local_ctx, r->basedn);
+ VALID_DN_SYNTAX(basedn, 0);
- DEBUG(10, ("sldb_Search: basedn: [%s]\n", basedn->dn));
- DEBUG(10, ("sldb_Search: filter: [%s]\n", r->filter));
+ DEBUG(10, ("sldb_Search: basedn: [%s]\n", r->basedn));
+ DEBUG(10, ("sldb_Search: filter: [%s]\n", ldb_filter_from_tree(call, r->tree)));
switch (r->scope) {
case LDAP_SEARCH_SCOPE_BASE:
DEBUG(10,("sldb_Search: scope: [BASE]\n"));
scope = LDB_SCOPE_BASE;
+ success_limit = 0;
break;
case LDAP_SEARCH_SCOPE_SINGLE:
DEBUG(10,("sldb_Search: scope: [ONE]\n"));
scope = LDB_SCOPE_ONELEVEL;
+ success_limit = 0;
break;
case LDAP_SEARCH_SCOPE_SUB:
DEBUG(10,("sldb_Search: scope: [SUB]\n"));
scope = LDB_SCOPE_SUBTREE;
+ success_limit = 0;
break;
}
if (r->num_attributes >= 1) {
- attrs = talloc_array_p(samdb, const char *, r->num_attributes+1);
- ALLOC_CHECK(attrs);
+ attrs = talloc_array(samdb, const char *, r->num_attributes+1);
+ NT_STATUS_HAVE_NO_MEMORY(attrs);
for (i=0; i < r->num_attributes; i++) {
DEBUG(10,("sldb_Search: attrs: [%s]\n",r->attributes[i]));
attrs[i] = NULL;
}
- ldb_set_alloc(samdb->ldb, talloc_realloc_fn, samdb);
- count = ldb_search(samdb->ldb, basedn->dn, scope, r->filter, attrs, &res);
+ DEBUG(5,("ldb_request dn=%s filter=%s\n",
+ r->basedn, ldb_filter_from_tree(call, r->tree)));
- for (i=0; i < count; i++) {
- ent_r = ldapsrv_init_reply(call, LDAP_TAG_SearchResultEntry);
- ALLOC_CHECK(ent_r);
+ ZERO_STRUCT(lreq);
+ lreq.operation = LDB_REQ_SEARCH;
+ lreq.op.search.base = basedn;
+ lreq.op.search.scope = scope;
+ lreq.op.search.tree = r->tree;
+ lreq.op.search.attrs = attrs;
- ent = &ent_r->msg.r.SearchResultEntry;
- ent->dn = talloc_steal(ent_r, res[i]->dn);
- ent->num_attributes = 0;
- ent->attributes = NULL;
- if (res[i]->num_elements == 0) {
- goto queue_reply;
- }
- ent->num_attributes = res[i]->num_elements;
- ent->attributes = talloc_array_p(ent_r, struct ldap_attribute, ent->num_attributes);
- ALLOC_CHECK(ent->attributes);
- for (j=0; j < ent->num_attributes; j++) {
- ent->attributes[j].name = talloc_steal(ent->attributes, res[i]->elements[j].name);
- ent->attributes[j].num_values = 0;
- ent->attributes[j].values = NULL;
- if (r->attributesonly && (res[i]->elements[j].num_values == 0)) {
- continue;
+ ret = ldb_request(samdb, &lreq);
+
+ res = talloc_steal(samdb, lreq.op.search.res);
+
+ if (ret == LDB_SUCCESS) {
+ for (i = 0; i < res->count; i++) {
+ ent_r = ldapsrv_init_reply(call, LDAP_TAG_SearchResultEntry);
+ NT_STATUS_HAVE_NO_MEMORY(ent_r);
+
+ ent = &ent_r->msg->r.SearchResultEntry;
+ ent->dn = ldb_dn_linearize(ent_r, res->msgs[i]->dn);
+ ent->num_attributes = 0;
+ ent->attributes = NULL;
+ if (res->msgs[i]->num_elements == 0) {
+ goto queue_reply;
}
- ent->attributes[j].num_values = res[i]->elements[j].num_values;
- ent->attributes[j].values = talloc_array_p(ent->attributes,
- DATA_BLOB, ent->attributes[j].num_values);
- ALLOC_CHECK(ent->attributes[j].values);
- for (y=0; y < ent->attributes[j].num_values; y++) {
- ent->attributes[j].values[y].length = res[i]->elements[j].values[y].length;
- ent->attributes[j].values[y].data = talloc_steal(ent->attributes[j].values,
- res[i]->elements[j].values[y].data);
+ ent->num_attributes = res->msgs[i]->num_elements;
+ ent->attributes = talloc_array(ent_r, struct ldb_message_element, ent->num_attributes);
+ NT_STATUS_HAVE_NO_MEMORY(ent->attributes);
+ for (j=0; j < ent->num_attributes; j++) {
+ ent->attributes[j].name = talloc_steal(ent->attributes, res->msgs[i]->elements[j].name);
+ ent->attributes[j].num_values = 0;
+ ent->attributes[j].values = NULL;
+ if (r->attributesonly && (res->msgs[i]->elements[j].num_values == 0)) {
+ continue;
+ }
+ ent->attributes[j].num_values = res->msgs[i]->elements[j].num_values;
+ ent->attributes[j].values = talloc_array(ent->attributes,
+ DATA_BLOB, ent->attributes[j].num_values);
+ NT_STATUS_HAVE_NO_MEMORY(ent->attributes[j].values);
+ for (y=0; y < ent->attributes[j].num_values; y++) {
+ ent->attributes[j].values[y].length = res->msgs[i]->elements[j].values[y].length;
+ ent->attributes[j].values[y].data = talloc_steal(ent->attributes[j].values,
+ res->msgs[i]->elements[j].values[y].data);
+ }
}
- }
queue_reply:
- status = ldapsrv_queue_reply(call, ent_r);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
+ ldapsrv_queue_reply(call, ent_r);
}
}
reply:
done_r = ldapsrv_init_reply(call, LDAP_TAG_SearchResultDone);
- ALLOC_CHECK(done_r);
+ NT_STATUS_HAVE_NO_MEMORY(done_r);
- if (result == LDAP_SUCCESS) {
- if (count > 0) {
- DEBUG(10,("sldb_Search: results: [%d]\n",count));
+ if (ret == LDB_SUCCESS) {
+ if (res->count >= success_limit) {
+ DEBUG(10,("sldb_Search: results: [%d]\n", res->count));
result = LDAP_SUCCESS;
errstr = NULL;
- } else if (count == 0) {
+ } else if (res->count == 0) {
DEBUG(10,("sldb_Search: no results\n"));
result = LDAP_NO_SUCH_OBJECT;
- errstr = ldb_errstring(samdb->ldb);
- } else if (count == -1) {
- DEBUG(10,("sldb_Search: error\n"));
- result = LDAP_OTHER;
- errstr = ldb_errstring(samdb->ldb);
+ errstr = ldb_errstring(samdb);
}
+ } else {
+ DEBUG(10,("sldb_Search: error\n"));
+ result = ret;
+ errstr = ldb_errstring(samdb);
}
- done = &done_r->msg.r.SearchResultDone;
+ done = &done_r->msg->r.SearchResultDone;
done->dn = NULL;
done->resultcode = result;
- done->errormessage = (errstr?talloc_strdup(done_r,errstr):NULL);
+ done->errormessage = (errstr?talloc_strdup(done_r, errstr):NULL);
done->referral = NULL;
talloc_free(local_ctx);
- return ldapsrv_queue_reply(call, done_r);
+ ldapsrv_queue_reply(call, done_r);
+ return NT_STATUS_OK;
}
static NTSTATUS sldb_Add(struct ldapsrv_partition *partition, struct ldapsrv_call *call,
- struct ldap_AddRequest *r)
+ struct ldap_AddRequest *r)
{
void *local_ctx;
- struct ldap_dn *dn;
+ struct ldb_dn *dn;
struct ldap_Result *add_result;
struct ldapsrv_reply *add_reply;
int ldb_ret;
- struct samdb_context *samdb;
- struct ldb_message *msg;
+ struct ldb_context *samdb;
+ struct ldb_message *msg = NULL;
int result = LDAP_SUCCESS;
const char *errstr = NULL;
int i,j;
local_ctx = talloc_named(call, 0, "sldb_Add local memory context");
- ALLOC_CHECK(local_ctx);
+ NT_STATUS_HAVE_NO_MEMORY(local_ctx);
- samdb = samdb_connect(local_ctx);
- ALLOC_CHECK(samdb);
+ samdb = talloc_get_type(partition->private, struct ldb_context);
- dn = ldap_parse_dn(local_ctx, r->dn);
+ dn = ldb_dn_explode(local_ctx, r->dn);
VALID_DN_SYNTAX(dn,1);
- DEBUG(10, ("sldb_add: dn: [%s]\n", dn->dn));
+ DEBUG(10, ("sldb_add: dn: [%s]\n", r->dn));
- msg = talloc_p(local_ctx, struct ldb_message);
- ALLOC_CHECK(msg);
+ msg = talloc(local_ctx, struct ldb_message);
+ NT_STATUS_HAVE_NO_MEMORY(msg);
- msg->dn = dn->dn;
+ msg->dn = dn;
msg->private_data = NULL;
msg->num_elements = 0;
msg->elements = NULL;
if (r->num_attributes > 0) {
msg->num_elements = r->num_attributes;
- msg->elements = talloc_array_p(msg, struct ldb_message_element, msg->num_elements);
- ALLOC_CHECK(msg->elements);
+ msg->elements = talloc_array(msg, struct ldb_message_element, msg->num_elements);
+ NT_STATUS_HAVE_NO_MEMORY(msg->elements);
for (i=0; i < msg->num_elements; i++) {
msg->elements[i].name = discard_const_p(char, r->attributes[i].name);
if (r->attributes[i].num_values > 0) {
msg->elements[i].num_values = r->attributes[i].num_values;
- msg->elements[i].values = talloc_array_p(msg, struct ldb_val, msg->elements[i].num_values);
- ALLOC_CHECK(msg->elements[i].values);
+ msg->elements[i].values = talloc_array(msg, struct ldb_val, msg->elements[i].num_values);
+ NT_STATUS_HAVE_NO_MEMORY(msg->elements[i].values);
for (j=0; j < msg->elements[i].num_values; j++) {
if (!(r->attributes[i].values[j].length > 0)) {
reply:
add_reply = ldapsrv_init_reply(call, LDAP_TAG_AddResponse);
- ALLOC_CHECK(add_reply);
+ NT_STATUS_HAVE_NO_MEMORY(add_reply);
if (result == LDAP_SUCCESS) {
- ldb_set_alloc(samdb->ldb, talloc_realloc_fn, samdb);
- ldb_ret = ldb_add(samdb->ldb, msg);
- if (ldb_ret == 0) {
- result = LDAP_SUCCESS;
- errstr = NULL;
- } else {
- /* currently we have no way to tell if there was an internal ldb error
- * or if the object was not found, return the most probable error
- */
- result = LDAP_OPERATIONS_ERROR;
- errstr = ldb_errstring(samdb->ldb);
- }
+ ldb_ret = ldb_add(samdb, msg);
+ result = sldb_map_error(partition, ldb_ret, &errstr);
}
- add_result = &add_reply->msg.r.AddResponse;
+ add_result = &add_reply->msg->r.AddResponse;
add_result->dn = NULL;
add_result->resultcode = result;
add_result->errormessage = (errstr?talloc_strdup(add_reply,errstr):NULL);
talloc_free(local_ctx);
- return ldapsrv_queue_reply(call, add_reply);
+ ldapsrv_queue_reply(call, add_reply);
+ return NT_STATUS_OK;
}
static NTSTATUS sldb_Del(struct ldapsrv_partition *partition, struct ldapsrv_call *call,
struct ldap_DelRequest *r)
{
void *local_ctx;
- struct ldap_dn *dn;
+ struct ldb_dn *dn;
struct ldap_Result *del_result;
struct ldapsrv_reply *del_reply;
int ldb_ret;
- struct samdb_context *samdb;
+ struct ldb_context *samdb;
const char *errstr = NULL;
int result = LDAP_SUCCESS;
local_ctx = talloc_named(call, 0, "sldb_Del local memory context");
- ALLOC_CHECK(local_ctx);
+ NT_STATUS_HAVE_NO_MEMORY(local_ctx);
- samdb = samdb_connect(local_ctx);
- ALLOC_CHECK(samdb);
+ samdb = talloc_get_type(partition->private, struct ldb_context);
- dn = ldap_parse_dn(local_ctx, r->dn);
+ dn = ldb_dn_explode(local_ctx, r->dn);
VALID_DN_SYNTAX(dn,1);
- DEBUG(10, ("sldb_Del: dn: [%s]\n", dn->dn));
+ DEBUG(10, ("sldb_Del: dn: [%s]\n", r->dn));
reply:
del_reply = ldapsrv_init_reply(call, LDAP_TAG_DelResponse);
- ALLOC_CHECK(del_reply);
+ NT_STATUS_HAVE_NO_MEMORY(del_reply);
if (result == LDAP_SUCCESS) {
- ldb_set_alloc(samdb->ldb, talloc_realloc_fn, samdb);
- ldb_ret = ldb_delete(samdb->ldb, dn->dn);
- if (ldb_ret == 0) {
- result = LDAP_SUCCESS;
- errstr = NULL;
- } else {
- /* currently we have no way to tell if there was an internal ldb error
- * or if the object was not found, return the most probable error
- */
- result = LDAP_NO_SUCH_OBJECT;
- errstr = ldb_errstring(samdb->ldb);
- }
+ ldb_ret = ldb_delete(samdb, dn);
+ result = sldb_map_error(partition, ldb_ret, &errstr);
}
- del_result = &del_reply->msg.r.DelResponse;
+ del_result = &del_reply->msg->r.DelResponse;
del_result->dn = NULL;
del_result->resultcode = result;
del_result->errormessage = (errstr?talloc_strdup(del_reply,errstr):NULL);
talloc_free(local_ctx);
- return ldapsrv_queue_reply(call, del_reply);
+ ldapsrv_queue_reply(call, del_reply);
+ return NT_STATUS_OK;
}
static NTSTATUS sldb_Modify(struct ldapsrv_partition *partition, struct ldapsrv_call *call,
struct ldap_ModifyRequest *r)
{
void *local_ctx;
- struct ldap_dn *dn;
+ struct ldb_dn *dn;
struct ldap_Result *modify_result;
struct ldapsrv_reply *modify_reply;
int ldb_ret;
- struct samdb_context *samdb;
- struct ldb_message *msg;
+ struct ldb_context *samdb;
+ struct ldb_message *msg = NULL;
int result = LDAP_SUCCESS;
const char *errstr = NULL;
int i,j;
local_ctx = talloc_named(call, 0, "sldb_Modify local memory context");
- ALLOC_CHECK(local_ctx);
+ NT_STATUS_HAVE_NO_MEMORY(local_ctx);
- samdb = samdb_connect(local_ctx);
- ALLOC_CHECK(samdb);
+ samdb = talloc_get_type(partition->private, struct ldb_context);
- dn = ldap_parse_dn(local_ctx, r->dn);
- VALID_DN_SYNTAX(dn,1);
+ dn = ldb_dn_explode(local_ctx, r->dn);
+ VALID_DN_SYNTAX(dn, 1);
- DEBUG(10, ("sldb_modify: dn: [%s]\n", dn->dn));
+ DEBUG(10, ("sldb_modify: dn: [%s]\n", r->dn));
- msg = talloc_p(local_ctx, struct ldb_message);
- ALLOC_CHECK(msg);
+ msg = talloc(local_ctx, struct ldb_message);
+ NT_STATUS_HAVE_NO_MEMORY(msg);
- msg->dn = dn->dn;
+ msg->dn = dn;
msg->private_data = NULL;
msg->num_elements = 0;
msg->elements = NULL;
if (r->num_mods > 0) {
msg->num_elements = r->num_mods;
- msg->elements = talloc_array_p(msg, struct ldb_message_element, r->num_mods);
- ALLOC_CHECK(msg->elements);
+ msg->elements = talloc_array(msg, struct ldb_message_element, r->num_mods);
+ NT_STATUS_HAVE_NO_MEMORY(msg->elements);
for (i=0; i < msg->num_elements; i++) {
msg->elements[i].name = discard_const_p(char, r->mods[i].attrib.name);
msg->elements[i].num_values = r->mods[i].attrib.num_values;
if (msg->elements[i].num_values > 0) {
- msg->elements[i].values = talloc_array_p(msg, struct ldb_val, msg->elements[i].num_values);
- ALLOC_CHECK(msg->elements[i].values);
+ msg->elements[i].values = talloc_array(msg, struct ldb_val, msg->elements[i].num_values);
+ NT_STATUS_HAVE_NO_MEMORY(msg->elements[i].values);
for (j=0; j < msg->elements[i].num_values; j++) {
if (!(r->mods[i].attrib.values[j].length > 0)) {
reply:
modify_reply = ldapsrv_init_reply(call, LDAP_TAG_ModifyResponse);
- ALLOC_CHECK(modify_reply);
+ NT_STATUS_HAVE_NO_MEMORY(modify_reply);
if (result == LDAP_SUCCESS) {
- ldb_set_alloc(samdb->ldb, talloc_realloc_fn, samdb);
- ldb_ret = ldb_modify(samdb->ldb, msg);
- if (ldb_ret == 0) {
- result = LDAP_SUCCESS;
- errstr = NULL;
- } else {
- /* currently we have no way to tell if there was an internal ldb error
- * or if the object was not found, return the most probable error
- */
- result = LDAP_OPERATIONS_ERROR;
- errstr = ldb_errstring(samdb->ldb);
- }
+ ldb_ret = ldb_modify(samdb, msg);
+ result = sldb_map_error(partition, ldb_ret, &errstr);
}
- modify_result = &modify_reply->msg.r.AddResponse;
+ modify_result = &modify_reply->msg->r.AddResponse;
modify_result->dn = NULL;
modify_result->resultcode = result;
modify_result->errormessage = (errstr?talloc_strdup(modify_reply,errstr):NULL);
talloc_free(local_ctx);
- return ldapsrv_queue_reply(call, modify_reply);
+ ldapsrv_queue_reply(call, modify_reply);
+ return NT_STATUS_OK;
}
static NTSTATUS sldb_Compare(struct ldapsrv_partition *partition, struct ldapsrv_call *call,
struct ldap_CompareRequest *r)
{
void *local_ctx;
- struct ldap_dn *dn;
+ struct ldb_dn *dn;
struct ldap_Result *compare;
struct ldapsrv_reply *compare_r;
int result = LDAP_SUCCESS;
- struct samdb_context *samdb;
- struct ldb_message **res;
+ struct ldb_context *samdb;
+ struct ldb_result *res = NULL;
const char *attrs[1];
const char *errstr = NULL;
- const char *filter;
- int count;
+ const char *filter = NULL;
+ int ret;
local_ctx = talloc_named(call, 0, "sldb_Compare local_memory_context");
- ALLOC_CHECK(local_ctx);
+ NT_STATUS_HAVE_NO_MEMORY(local_ctx);
- samdb = samdb_connect(local_ctx);
- ALLOC_CHECK(samdb);
+ samdb = talloc_get_type(partition->private, struct ldb_context);
- dn = ldap_parse_dn(local_ctx, r->dn);
- VALID_DN_SYNTAX(dn,1);
+ dn = ldb_dn_explode(local_ctx, r->dn);
+ VALID_DN_SYNTAX(dn, 1);
- DEBUG(10, ("sldb_Compare: dn: [%s]\n", dn->dn));
- filter = talloc_asprintf(local_ctx, "(%s=%*s)", r->attribute, r->value.length, r->value.data);
- ALLOC_CHECK(filter);
+ DEBUG(10, ("sldb_Compare: dn: [%s]\n", r->dn));
+ filter = talloc_asprintf(local_ctx, "(%s=%*s)", r->attribute,
+ (int)r->value.length, r->value.data);
+ NT_STATUS_HAVE_NO_MEMORY(filter);
DEBUGADD(10, ("sldb_Compare: attribute: [%s]\n", filter));
reply:
compare_r = ldapsrv_init_reply(call, LDAP_TAG_CompareResponse);
- ALLOC_CHECK(compare_r);
+ NT_STATUS_HAVE_NO_MEMORY(compare_r);
if (result == LDAP_SUCCESS) {
- ldb_set_alloc(samdb->ldb, talloc_realloc_fn, samdb);
- count = ldb_search(samdb->ldb, dn->dn, LDB_SCOPE_BASE, filter, attrs, &res);
- if (count == 1) {
- DEBUG(10,("sldb_Compare: matched\n"));
- result = LDAP_COMPARE_TRUE;
- errstr = NULL;
- } else if (count == 0) {
+ ret = ldb_search(samdb, dn, LDB_SCOPE_BASE, filter, attrs, &res);
+ talloc_steal(samdb, res);
+ if (ret != LDB_SUCCESS) {
+ result = LDAP_OTHER;
+ errstr = ldb_errstring(samdb);
+ DEBUG(10,("sldb_Compare: error: %s\n", errstr));
+ } else if (res->count == 0) {
DEBUG(10,("sldb_Compare: doesn't matched\n"));
result = LDAP_COMPARE_FALSE;
errstr = NULL;
- } else if (count > 1) {
+ } else if (res->count == 1) {
+ DEBUG(10,("sldb_Compare: matched\n"));
+ result = LDAP_COMPARE_TRUE;
+ errstr = NULL;
+ } else if (res->count > 1) {
result = LDAP_OTHER;
errstr = "too many objects match";
- DEBUG(10,("sldb_Compare: %d results: %s\n", count, errstr));
- } else if (count == -1) {
- result = LDAP_OTHER;
- errstr = ldb_errstring(samdb->ldb);
- DEBUG(10,("sldb_Compare: error: %s\n", errstr));
+ DEBUG(10,("sldb_Compare: %d results: %s\n", res->count, errstr));
}
}
- compare = &compare_r->msg.r.CompareResponse;
+ compare = &compare_r->msg->r.CompareResponse;
compare->dn = NULL;
compare->resultcode = result;
compare->errormessage = (errstr?talloc_strdup(compare_r,errstr):NULL);
talloc_free(local_ctx);
- return ldapsrv_queue_reply(call, compare_r);
+ ldapsrv_queue_reply(call, compare_r);
+ return NT_STATUS_OK;
}
-NTSTATUS sldb_ModifyDN(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_ModifyDNRequest *r)
+static NTSTATUS sldb_ModifyDN(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_ModifyDNRequest *r)
{
void *local_ctx;
- struct ldap_dn *olddn, *newrdn, *newsuperior;
+ struct ldb_dn *olddn, *newdn, *newrdn;
+ struct ldb_dn *parentdn = NULL;
struct ldap_Result *modifydn;
struct ldapsrv_reply *modifydn_r;
int ldb_ret;
- struct samdb_context *samdb;
+ struct ldb_context *samdb;
const char *errstr = NULL;
int result = LDAP_SUCCESS;
- const char *newdn;
- char *parentdn = NULL;
local_ctx = talloc_named(call, 0, "sldb_ModifyDN local memory context");
- ALLOC_CHECK(local_ctx);
+ NT_STATUS_HAVE_NO_MEMORY(local_ctx);
- samdb = samdb_connect(local_ctx);
- ALLOC_CHECK(samdb);
+ samdb = talloc_get_type(partition->private, struct ldb_context);
- olddn = ldap_parse_dn(local_ctx, r->dn);
- VALID_DN_SYNTAX(olddn,2);
+ olddn = ldb_dn_explode(local_ctx, r->dn);
+ VALID_DN_SYNTAX(olddn, 2);
- newrdn = ldap_parse_dn(local_ctx, r->newrdn);
- VALID_DN_SYNTAX(newrdn,1);
+ newrdn = ldb_dn_explode(local_ctx, r->newrdn);
+ VALID_DN_SYNTAX(newrdn, 1);
- DEBUG(10, ("sldb_ModifyDN: olddn: [%s]\n", olddn->dn));
- DEBUG(10, ("sldb_ModifyDN: newrdn: [%s]\n", newrdn->dn));
+ DEBUG(10, ("sldb_ModifyDN: olddn: [%s]\n", r->dn));
+ DEBUG(10, ("sldb_ModifyDN: newrdn: [%s]\n", r->newrdn));
/* we can't handle the rename if we should not remove the old dn */
if (!r->deleteolddn) {
}
if (r->newsuperior) {
- newsuperior = ldap_parse_dn(local_ctx, r->newsuperior);
- VALID_DN_SYNTAX(newsuperior,0);
- DEBUG(10, ("sldb_ModifyDN: newsuperior: [%s]\n", newsuperior->dn));
+ parentdn = ldb_dn_explode(local_ctx, r->newsuperior);
+ VALID_DN_SYNTAX(parentdn, 0);
+ DEBUG(10, ("sldb_ModifyDN: newsuperior: [%s]\n", r->newsuperior));
- if (newsuperior->comp_num < 1) {
+ if (parentdn->comp_num < 1) {
result = LDAP_AFFECTS_MULTIPLE_DSAS;
errstr = "Error new Superior DN invalid";
goto reply;
}
- parentdn = newsuperior->dn;
}
if (!parentdn) {
- int i;
- parentdn = talloc_strdup(local_ctx, olddn->components[1]->component);
- ALLOC_CHECK(parentdn);
- for(i=2; i < olddn->comp_num; i++) {
- char *old = parentdn;
- parentdn = talloc_asprintf(local_ctx, "%s,%s", old, olddn->components[i]->component);
- ALLOC_CHECK(parentdn);
- talloc_free(old);
- }
+ parentdn = ldb_dn_get_parent(local_ctx, olddn);
+ NT_STATUS_HAVE_NO_MEMORY(parentdn);
}
- newdn = talloc_asprintf(local_ctx, "%s,%s", newrdn->dn, parentdn);
- ALLOC_CHECK(newdn);
+
+ newdn = ldb_dn_make_child(local_ctx, ldb_dn_get_rdn(local_ctx, newrdn), parentdn);
+ NT_STATUS_HAVE_NO_MEMORY(newdn);
reply:
modifydn_r = ldapsrv_init_reply(call, LDAP_TAG_ModifyDNResponse);
- ALLOC_CHECK(modifydn_r);
+ NT_STATUS_HAVE_NO_MEMORY(modifydn_r);
if (result == LDAP_SUCCESS) {
- ldb_set_alloc(samdb->ldb, talloc_realloc_fn, samdb);
- ldb_ret = ldb_rename(samdb->ldb, olddn->dn, newdn);
- if (ldb_ret == 0) {
- result = LDAP_SUCCESS;
- errstr = NULL;
- } else {
- /* currently we have no way to tell if there was an internal ldb error
- * or if the object was not found, return the most probable error
- */
- result = LDAP_NO_SUCH_OBJECT;
- errstr = ldb_errstring(samdb->ldb);
- }
+ ldb_ret = ldb_rename(samdb, olddn, newdn);
+ result = sldb_map_error(partition, ldb_ret, &errstr);
}
- modifydn = &modifydn_r->msg.r.ModifyDNResponse;
+ modifydn = &modifydn_r->msg->r.ModifyDNResponse;
modifydn->dn = NULL;
modifydn->resultcode = result;
modifydn->errormessage = (errstr?talloc_strdup(modifydn_r,errstr):NULL);
talloc_free(local_ctx);
- return ldapsrv_queue_reply(call, modifydn_r);
+ ldapsrv_queue_reply(call, modifydn_r);
+ return NT_STATUS_OK;
}
static const struct ldapsrv_partition_ops sldb_ops = {
+ .Init = sldb_Init,
+ .Bind = sldb_Bind,
.Search = sldb_Search,
.Add = sldb_Add,
.Del = sldb_Del,
git.samba.org / abartlet / samba.git / .git / blobdiff