diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-01-31 03:20:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:38 -0500 |
| commit | 99f0659f67eb59d55aeee31bd16614a7ebe282a1 (patch) | |
| tree | a763eefa76b03c028c9949357b3f19ff61c0f343 /source4/dsdb/samdb | |
| parent | 13c1f1b6f14bf6459e4046f3ffa7d45897b317f5 (diff) | |
| download | samba-99f0659f67eb59d55aeee31bd16614a7ebe282a1.tar.gz samba-99f0659f67eb59d55aeee31bd16614a7ebe282a1.tar.bz2 samba-99f0659f67eb59d55aeee31bd16614a7ebe282a1.zip | |
r13253: More work to ensure that we don't keep data on long-term contexts.
Andrew Bartlett
(This used to be commit 35517573ff807339f96573e58bdec29073be9594)
Diffstat (limited to 'source4/dsdb/samdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/kludge_acl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c index d6f7861f6b..0d0a266119 100644 --- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c +++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c @@ -199,6 +199,7 @@ static int kludge_acl_init_2(struct ldb_module *module) talloc_free(mem_ctx); return ret; } + talloc_steal(mem_ctx, res); if (res->count == 0) { talloc_free(mem_ctx); data->password_attrs = NULL; @@ -206,6 +207,7 @@ static int kludge_acl_init_2(struct ldb_module *module) } if (res->count > 1) { + talloc_free(mem_ctx); return LDB_ERR_CONSTRAINT_VIOLATION; } @@ -213,10 +215,12 @@ static int kludge_acl_init_2(struct ldb_module *module) password_attributes = ldb_msg_find_element(msg, "passwordAttribute"); if (!password_attributes) { + talloc_free(mem_ctx); return LDB_SUCCESS; } data->password_attrs = talloc_array(data, const char *, password_attributes->num_values + 1); if (!data->password_attrs) { + talloc_free(mem_ctx); return LDB_ERR_OPERATIONS_ERROR; } for (i=0; i < password_attributes->num_values; i++) { @@ -224,6 +228,7 @@ static int kludge_acl_init_2(struct ldb_module *module) talloc_steal(data->password_attrs, password_attributes->values[i].data); } data->password_attrs[i] = NULL; + talloc_free(mem_ctx); return LDB_SUCCESS; } |