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:libads: Cleanup error code paths in ads_create_machine_acct()

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
This commit is contained in:
Andreas Schneider 2019-08-13 16:30:07 +02:00 committed by Andreas Schneider
parent b84abb3a46
commit 8ed993789f
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source3/libads/ldap.c
View File

@ -2092,11 +2092,12 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
uint32_t etype_list)
{
ADS_STATUS ret;
char *samAccountName, *controlstr;
TALLOC_CTX *ctx;
char *samAccountName = NULL;
char *controlstr = NULL;
TALLOC_CTX *ctx = NULL;
ADS_MODLIST mods;
char *machine_escaped = NULL;
char *new_dn;
char *new_dn = NULL;
const char *objectClass[] = {"top", "person", "organizationalPerson",
"user", "computer", NULL};
LDAPMessage *res = NULL;
@ -2110,13 +2111,14 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
return ret;
}
if (!(ctx = talloc_init("ads_add_machine_acct")))
ctx = talloc_init("ads_add_machine_acct");
if (ctx == NULL) {
return ADS_ERROR(LDAP_NO_MEMORY);
ret = ADS_ERROR(LDAP_NO_MEMORY);
}
machine_escaped = escape_rdn_val_string_alloc(machine_name);
if (!machine_escaped) {
if (machine_escaped == NULL) {
ret = ADS_ERROR(LDAP_NO_MEMORY);
goto done;
}
@ -2131,17 +2133,26 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
ads_msgfree(ads, res);
new_dn = talloc_asprintf(ctx, "cn=%s,%s", machine_escaped, org_unit);
if (new_dn == NULL) {
ret = ADS_ERROR(LDAP_NO_MEMORY);
goto done;
}
samAccountName = talloc_asprintf(ctx, "%s$", machine_name);
if ( !new_dn || !samAccountName ) {
if (samAccountName == NULL) {
ret = ADS_ERROR(LDAP_NO_MEMORY);
goto done;
}
if (!(controlstr = talloc_asprintf(ctx, "%u", acct_control))) {
controlstr = talloc_asprintf(ctx, "%u", acct_control);
if (controlstr == NULL) {
ret = ADS_ERROR(LDAP_NO_MEMORY);
goto done;
}
if (!(mods = ads_init_mods(ctx))) {
mods = ads_init_mods(ctx);
if (mods == NULL) {
ret = ADS_ERROR(LDAP_NO_MEMORY);
goto done;
}
@ -2155,6 +2166,7 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
etype_list_str = talloc_asprintf(ctx, "%d", (int)etype_list);
if (etype_list_str == NULL) {
ret = ADS_ERROR(LDAP_NO_MEMORY);
goto done;
}
ads_mod_str(ctx, &mods, "msDS-SupportedEncryptionTypes",