sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

r13606: An attempt to fix #3525.

Browse Source 
The problem was that the supportedControls were being stolen into the
result sent to the client, then talloc_free()ed.  This caused them to
be invalid on the next rootDSE query.

This also tries to avoid attaching the result to the long-term samdb
context, and avoids an extra loop in the result processing (pointed
out by tridge).

Andrew BARtlett
(This used to be commit d0b8957f38fda4d84a318d6121ad87ba53a9ddb3)
This commit is contained in:
Andrew Bartlett 2006-02-22 00:26:56 +00:00 committed by Gerald (Jerry) Carter
parent 4515708b81
commit f490434c0f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/dsdb/samdb/ldb_modules/rootdse.c
View File

@ -73,8 +73,12 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_request *re
if (do_attribute(s->attrs, "supportedControl")) { if (do_attribute(s->attrs, "supportedControl")) {
int i; int i;
for (i = 0; i < priv->num_controls; i++) { for (i = 0; i < priv->num_controls; i++) {
char *control = talloc_strdup(msg, priv->controls[i]);
if (!control) {
goto failed;
}
if (ldb_msg_add_string(msg, "supportedControl", if (ldb_msg_add_string(msg, "supportedControl",
priv->controls[i]) != 0) { control) != 0) {
goto failed; goto failed;
} }
} }

20
source4/ldap_server/ldap_backend.c
View File

@ -153,7 +153,7 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
struct ldap_Result *done; struct ldap_Result *done;
struct ldapsrv_reply *ent_r, *done_r; struct ldapsrv_reply *ent_r, *done_r;
void *local_ctx; void *local_ctx;
struct ldb_context *samdb = call->conn->ldb; struct ldb_context *samdb = talloc_get_type(call->conn->ldb, struct ldb_context);
struct ldb_dn *basedn; struct ldb_dn *basedn;
struct ldb_result *res = NULL; struct ldb_result *res = NULL;
struct ldb_request lreq; struct ldb_request lreq;
@ -163,13 +163,13 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
int success_limit = 1; int success_limit = 1;
int result = LDAP_SUCCESS; int result = LDAP_SUCCESS;
int ldb_ret; int ldb_ret;
int i, j, y; int i, j;
DEBUG(10, ("SearchRequest")); DEBUG(10, ("SearchRequest"));
DEBUGADD(10, (" basedn: %s", req->basedn)); DEBUGADD(10, (" basedn: %s", req->basedn));
DEBUGADD(10, (" filter: %s\n", ldb_filter_from_tree(call, req->tree))); DEBUGADD(10, (" filter: %s\n", ldb_filter_from_tree(call, req->tree)));
local_ctx = talloc_named(call, 0, "sldb_Search local memory context"); local_ctx = talloc_new(call);
NT_STATUS_HAVE_NO_MEMORY(local_ctx); NT_STATUS_HAVE_NO_MEMORY(local_ctx);
basedn = ldb_dn_explode(local_ctx, req->basedn); basedn = ldb_dn_explode(local_ctx, req->basedn);
@ -228,7 +228,8 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
ldb_ret = ldb_request(samdb, &lreq); ldb_ret = ldb_request(samdb, &lreq);
res = talloc_steal(samdb, lreq.op.search.res); /* Ensure we don't keep the search results around for too long */
res = talloc_steal(local_ctx, lreq.op.search.res);
if (ldb_ret == LDB_SUCCESS) { if (ldb_ret == LDB_SUCCESS) {
for (i = 0; i < res->count; i++) { for (i = 0; i < res->count; i++) {
@ -253,14 +254,8 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
continue; continue;
} }
ent->attributes[j].num_values = res->msgs[i]->elements[j].num_values; ent->attributes[j].num_values = res->msgs[i]->elements[j].num_values;
ent->attributes[j].values = talloc_array(ent->attributes, ent->attributes[j].values = res->msgs[i]->elements[j].values;
DATA_BLOB, ent->attributes[j].num_values); talloc_steal(ent->attributes, res->msgs[i]->elements[j].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: queue_reply:
ldapsrv_queue_reply(call, ent_r); ldapsrv_queue_reply(call, ent_r);
@ -287,6 +282,7 @@ reply:
} }
if (res->controls) { if (res->controls) {
done_r->msg->controls = (struct ldap_Control **)(res->controls); done_r->msg->controls = (struct ldap_Control **)(res->controls);
talloc_steal(done_r, res->controls);
} }
} else { } else {
DEBUG(10,("SearchRequest: error\n")); DEBUG(10,("SearchRequest: error\n"));