sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-21 09:49:28 +03:00
Code Activity

s3:net: Refactor net_ads_keytab_add(), allocate a talloc context

Browse Source 
ADS_STRUCT will be allocated in the talloc 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-26 13:29:56 +02:00
committed by Jeremy Allison
parent 484345bd4b
commit d4937439a6
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source3/utils/net_ads.c
View File

@ -2928,9 +2928,11 @@ static int net_ads_keytab_add(struct net_context *c,
const char **argv,
bool update_ads)
{
TALLOC_CTX *tmp_ctx = talloc_stackframe();
ADS_STRUCT *ads = NULL;
ADS_STATUS status;
int i;
int ret = 0;
ADS_STRUCT *ads;
int ret = -1;
if (c->display_usage) {
d_printf("%s\n%s",
@ -2939,6 +2941,7 @@ static int net_ads_keytab_add(struct net_context *c,
" Add principals to local keytab\n"
" principal\tKerberos principal to add to "
"keytab\n"));
TALLOC_FREE(tmp_ctx);
return 0;
}
@ -2948,13 +2951,17 @@ static int net_ads_keytab_add(struct net_context *c,
net_use_krb_machine_account(c);
}
if (!ADS_ERR_OK(ads_startup(c, true, &ads))) {
return -1;
status = ads_startup(c, true, &ads);
if (!ADS_ERR_OK(status)) {
goto out;
}
for (i = 0; i < argc; i++) {
for (ret = 0, i = 0; i < argc; i++) {
ret |= ads_keytab_add_entry(ads, argv[i], update_ads);
}
out:
ads_destroy(&ads);
TALLOC_FREE(tmp_ctx);
return ret;
}