summaryrefslogtreecommitdiff
path: root/source3/libads
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-12-20 20:21:31 +0000
committerJeremy Allison <jra@samba.org>2002-12-20 20:21:31 +0000
commitef8bd7c4f7ae8192ea05db070962ecf0ff3615f3 (patch)
tree09644a4bc94784b1f097a7cfb6259dad6c33ae0e /source3/libads
parent8c93138982da3f9444bdef63cf48de37876866ed (diff)
downloadsamba-ef8bd7c4f7ae8192ea05db070962ecf0ff3615f3.tar.gz
samba-ef8bd7c4f7ae8192ea05db070962ecf0ff3615f3.tar.bz2
samba-ef8bd7c4f7ae8192ea05db070962ecf0ff3615f3.zip
Forward port the change to talloc_init() to make all talloc contexts
named. Ensure we can query them. Jeremy. (This used to be commit 09a218a9f6fb0bd922940467bf8500eb4f1bcf84)
Diffstat (limited to 'source3/libads')
-rw-r--r--source3/libads/ldap.c14
-rw-r--r--source3/libads/ldap_user.c4
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index af9a6451fe..97ccf76983 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -420,7 +420,7 @@ ADS_STATUS ads_do_paged_search(ADS_STRUCT *ads, const char *bind_path,
*res = NULL;
- if (!(ctx = talloc_init()))
+ if (!(ctx = talloc_init("ads_do_paged_search")))
return ADS_ERROR(LDAP_NO_MEMORY);
/* 0 means the conversion worked but the result was empty
@@ -642,7 +642,7 @@ ADS_STATUS ads_do_search(ADS_STRUCT *ads, const char *bind_path, int scope,
char *utf8_exp, *utf8_path, **search_attrs = NULL;
TALLOC_CTX *ctx;
- if (!(ctx = talloc_init())) {
+ if (!(ctx = talloc_init("ads_do_search"))) {
DEBUG(1,("ads_do_search: talloc_init() failed!"));
return ADS_ERROR(LDAP_NO_MEMORY);
}
@@ -1031,7 +1031,7 @@ static ADS_STATUS ads_add_machine_acct(ADS_STRUCT *ads, const char *hostname,
char *psp;
unsigned acct_control;
- if (!(ctx = talloc_init_named("machine_account")))
+ if (!(ctx = talloc_init("machine_account")))
return ADS_ERROR(LDAP_NO_MEMORY);
ret = ADS_ERROR(LDAP_NO_MEMORY);
@@ -1144,7 +1144,7 @@ static void dump_sd(const char *filed, struct berval **values)
SEC_DESC *psd = 0;
TALLOC_CTX *ctx = 0;
- if (!(ctx = talloc_init_named("sec_io_desc")))
+ if (!(ctx = talloc_init("sec_io_desc")))
return;
/* prepare data */
@@ -1246,7 +1246,7 @@ void ads_process_results(ADS_STRUCT *ads, void *res,
void *msg;
TALLOC_CTX *ctx;
- if (!(ctx = talloc_init()))
+ if (!(ctx = talloc_init("ads_process_results")))
return;
for (msg = ads_first_entry(ads, res); msg;
@@ -1429,7 +1429,7 @@ ADS_STATUS ads_set_machine_sd(ADS_STRUCT *ads, const char *hostname, char *dn)
msg = ads_first_entry(ads, res);
ads_pull_sid(ads, msg, attrs[1], &sid);
- if (!(ctx = talloc_init_named("sec_io_desc"))) {
+ if (!(ctx = talloc_init("sec_io_desc"))) {
ret = ADS_ERROR(LDAP_NO_MEMORY);
goto ads_set_sd_error;
}
@@ -1785,7 +1785,7 @@ ADS_STATUS ads_server_info(ADS_STRUCT *ads)
char *timestr;
TALLOC_CTX *ctx;
- if (!(ctx = talloc_init())) {
+ if (!(ctx = talloc_init("ads_server_info"))) {
return ADS_ERROR(LDAP_NO_MEMORY);
}
diff --git a/source3/libads/ldap_user.c b/source3/libads/ldap_user.c
index b6fef24b5c..de19e2da5e 100644
--- a/source3/libads/ldap_user.c
+++ b/source3/libads/ldap_user.c
@@ -50,7 +50,7 @@ ADS_STATUS ads_add_user_acct(ADS_STRUCT *ads, const char *user,
if (fullname && *fullname) name = fullname;
else name = user;
- if (!(ctx = talloc_init_named("ads_add_user_acct")))
+ if (!(ctx = talloc_init("ads_add_user_acct")))
return ADS_ERROR(LDAP_NO_MEMORY);
status = ADS_ERROR(LDAP_NO_MEMORY);
@@ -88,7 +88,7 @@ ADS_STATUS ads_add_group_acct(ADS_STRUCT *ads, const char *group,
char *new_dn;
const char *objectClass[] = {"top", "group", NULL};
- if (!(ctx = talloc_init_named("ads_add_group_acct")))
+ if (!(ctx = talloc_init("ads_add_group_acct")))
return ADS_ERROR(LDAP_NO_MEMORY);
status = ADS_ERROR(LDAP_NO_MEMORY);