diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-03 06:39:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:34 -0500 |
| commit | 1429ed54f14055a1a9399452cb6cfc94f9451cf5 (patch) | |
| tree | 31fe5adaed9e5afe6f886a919078053fa34e7b4f /source4/ldap_server | |
| parent | 15b9736ed30d8e947dbe2513dd9cf27d5b3761af (diff) | |
| download | samba-1429ed54f14055a1a9399452cb6cfc94f9451cf5.tar.gz samba-1429ed54f14055a1a9399452cb6cfc94f9451cf5.tar.bz2 samba-1429ed54f14055a1a9399452cb6cfc94f9451cf5.zip | |
r2792: got rid of talloc_ldb_alloc() and instead created talloc_realloc_fn(),
so talloc now doesn't contain any ldb specific functions.
allow NULL to be passed to a couple more talloc() functions
(This used to be commit 1246f80d806fb5f63cfbf3879de6d546384552a8)
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_simple_ldb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/ldap_server/ldap_simple_ldb.c b/source4/ldap_server/ldap_simple_ldb.c index d4c576a189..7c6341b872 100644 --- a/source4/ldap_server/ldap_simple_ldb.c +++ b/source4/ldap_server/ldap_simple_ldb.c @@ -141,7 +141,7 @@ static NTSTATUS sldb_Search(struct ldapsrv_partition *partition, struct ldapsrv_ attrs[i] = NULL; } - ldb_set_alloc(ldb, talloc_ldb_alloc, samdb); + ldb_set_alloc(ldb, talloc_realloc_fn, samdb); count = ldb_search(ldb, basedn, scope, r->filter, attrs, &res); for (i=0; i < count; i++) { @@ -284,7 +284,7 @@ invalid_input: add_result->dn = talloc_steal(add_reply, dn); if (result == LDAP_SUCCESS) { - ldb_set_alloc(ldb, talloc_ldb_alloc, samdb); + ldb_set_alloc(ldb, talloc_realloc_fn, samdb); ldb_ret = ldb_add(ldb, msg); if (ldb_ret == 0) { result = LDAP_SUCCESS; @@ -330,7 +330,7 @@ static NTSTATUS sldb_Del(struct ldapsrv_partition *partition, struct ldapsrv_cal DEBUG(10, ("sldb_Del: dn: [%s]\n", dn)); - ldb_set_alloc(ldb, talloc_ldb_alloc, samdb); + ldb_set_alloc(ldb, talloc_realloc_fn, samdb); ldb_ret = ldb_delete(ldb, dn); del_reply = ldapsrv_init_reply(call, LDAP_TAG_DelResponse); @@ -449,7 +449,7 @@ invalid_input: modify_result->dn = talloc_steal(modify_reply, dn); if (result == LDAP_SUCCESS) { - ldb_set_alloc(ldb, talloc_ldb_alloc, samdb); + ldb_set_alloc(ldb, talloc_realloc_fn, samdb); ldb_ret = ldb_modify(ldb, msg); if (ldb_ret == 0) { result = LDAP_SUCCESS; @@ -503,7 +503,7 @@ static NTSTATUS sldb_Compare(struct ldapsrv_partition *partition, struct ldapsrv attrs[0] = NULL; - ldb_set_alloc(ldb, talloc_ldb_alloc, samdb); + ldb_set_alloc(ldb, talloc_realloc_fn, samdb); count = ldb_search(ldb, dn, LDB_SCOPE_BASE, filter, attrs, &res); compare_r = ldapsrv_init_reply(call, LDAP_TAG_CompareResponse); |