diff options
| -rw-r--r-- | source4/lib/db_wrap.c | 4 | ||||
| -rw-r--r-- | source4/nbt_server/dgram/netlogon.c | 10 | ||||
| -rw-r--r-- | source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c index 89ee0b16d2..0e026f84e1 100644 --- a/source4/lib/db_wrap.c +++ b/source4/lib/db_wrap.c @@ -80,7 +80,7 @@ static int ldb_wrap_destructor(struct ldb_context *ldb) { size_t *startup_blocks = (size_t *)ldb_get_opaque(ldb, "startup_blocks"); if (startup_blocks && - talloc_total_blocks(ldb) > *startup_blocks + 100) { + talloc_total_blocks(ldb) > *startup_blocks + 400) { DEBUG(0,("WARNING: probable memory leak in ldb %s - %lu blocks (startup %lu) %lu bytes\n", (char *)ldb_get_opaque(ldb, "wrap_url"), (unsigned long)talloc_total_blocks(ldb), @@ -88,6 +88,8 @@ static int ldb_wrap_destructor(struct ldb_context *ldb) (unsigned long)talloc_total_size(ldb))); #if 0 talloc_report_full(ldb, stdout); + call_backtrace(); + smb_panic("probable memory leak in ldb"); #endif } return 0; diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index dc6b01961a..c255238913 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -58,9 +58,9 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot, return; } - partitions_basedn = samdb_partitions_dn(samctx, samctx); + partitions_basedn = samdb_partitions_dn(samctx, packet); - ret = gendb_search(samctx, samctx, partitions_basedn, &ref_res, ref_attrs, + ret = gendb_search(samctx, packet, partitions_basedn, &ref_res, ref_attrs, "(&(&(nETBIOSName=%s)(objectclass=crossRef))(ncName=*))", name->name); @@ -128,9 +128,9 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot, return; } - partitions_basedn = samdb_partitions_dn(samctx, samctx); + partitions_basedn = samdb_partitions_dn(samctx, packet); - ret = gendb_search(samctx, samctx, partitions_basedn, &ref_res, ref_attrs, + ret = gendb_search(samctx, packet, partitions_basedn, &ref_res, ref_attrs, "(&(&(nETBIOSName=%s)(objectclass=crossRef))(ncName=*))", name->name); @@ -140,7 +140,7 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot, } /* try and find the domain */ - ret = gendb_search_dn(samctx, samctx, + ret = gendb_search_dn(samctx, packet, samdb_result_dn(samctx, samctx, ref_res[0], "ncName", NULL), &dom_res, dom_attrs); if (ret != 1) { diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c index f315cae102..0c22e856f2 100644 --- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c +++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c @@ -556,7 +556,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta struct ldb_dn *domain_dn; struct ldb_result *res_domain; struct ldb_result *res_account; - struct ldb_dn *ntds_dn = ldb_dn_copy(b_state->sam_ctx, res->msgs[i]->dn); + struct ldb_dn *ntds_dn = ldb_dn_copy(mem_ctx, res->msgs[i]->dn); struct ldb_dn *ref_dn = ldb_msg_find_attr_as_dn(b_state->sam_ctx, @@ -617,9 +617,9 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta struct ldb_dn *domain_dn; struct ldb_result *res_domain; struct ldb_result *res_account; - struct ldb_dn *ntds_dn = ldb_dn_copy(b_state->sam_ctx, res->msgs[i]->dn); + struct ldb_dn *ntds_dn = ldb_dn_copy(mem_ctx, res->msgs[i]->dn); struct ldb_result *res_ntds; - struct ldb_dn *site_dn = ldb_dn_copy(b_state->sam_ctx, res->msgs[i]->dn); + struct ldb_dn *site_dn = ldb_dn_copy(mem_ctx, res->msgs[i]->dn); struct ldb_result *res_site; struct ldb_dn *ref_dn = ldb_msg_find_attr_as_dn(b_state->sam_ctx, |