sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:net: Pass a memory context to ads_startup_nobind()

Browse Source 
The ads struct will be allocated under this context.

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Samuel Cabrero 2022-05-25 17:09:51 +02:00 committed by Jeremy Allison
parent 887188702d
commit 0693b9aa30
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/utils/net_ads.c
View File

@ -429,7 +429,7 @@ static int net_ads_lookup(struct net_context *c, int argc, const char **argv)
return 0;
}
status = ads_startup_nobind(c, false, &ads);
status = ads_startup_nobind(c, false, tmp_ctx, &ads);
if (!ADS_ERR_OK(status)) {
d_fprintf(stderr, _("Didn't find the cldap server!\n"));
goto out;
@ -555,7 +555,7 @@ static int net_ads_info(struct net_context *c, int argc, const char **argv)
return 0;
}
status = ads_startup_nobind(c, false, &ads);
status = ads_startup_nobind(c, false, tmp_ctx, &ads);
if (!ADS_ERR_OK(status)) {
d_fprintf(stderr, _("Didn't find the ldap server!\n"));
goto out;
@ -745,7 +745,10 @@ ADS_STATUS ads_startup(struct net_context *c, bool only_own_domain, ADS_STRUCT *
return ads_startup_int(c, only_own_domain, 0, ads);
}
ADS_STATUS ads_startup_nobind(struct net_context *c, bool only_own_domain, ADS_STRUCT **ads)
ADS_STATUS ads_startup_nobind(struct net_context *c,
bool only_own_domain,
TALLOC_CTX *mem_ctx,
ADS_STRUCT **ads)
{
return ads_startup_int(c, only_own_domain, ADS_AUTH_NO_BIND, ads);
}
@ -808,7 +811,7 @@ static int net_ads_workgroup(struct net_context *c, int argc, const char **argv)
return 0;
}
status = ads_startup_nobind(c, false, &ads);
status = ads_startup_nobind(c, false, tmp_ctx, &ads);
if (!ADS_ERR_OK(status)) {
d_fprintf(stderr, _("Didn't find the cldap server!\n"));
goto out;

5
source3/utils/net_proto.h
View File

@ -34,7 +34,10 @@ enum netr_SchannelType get_sec_channel_type(const char *param);
/* The following definitions come from utils/net_ads.c */
struct ads_struct;
ADS_STATUS ads_startup(struct net_context *c, bool only_own_domain, struct ads_struct **ads);
ADS_STATUS ads_startup_nobind(struct net_context *c, bool only_own_domain, struct ads_struct **ads);
ADS_STATUS ads_startup_nobind(struct net_context *c,
bool only_own_domain,
TALLOC_CTX *mem_ctx,
struct ads_struct **ads);
int net_ads_check_our_domain(struct net_context *c);
int net_ads_check(struct net_context *c);
int net_ads_user(struct net_context *c, int argc, const char **argv);