[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  ad4ef1657e9 s3:ldap: Fix join with don't exists machine account
      from  9173ae5f7f0 s3/lib/ctdbd_conn: assert hdr following read/recv

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ad4ef1657e9b2a088a3bfadcce196cfcceead1dc
Author: Evgeny Sinelnikov <sin at altlinux.org>
Date:   Wed Jul 31 23:17:20 2019 +0400

    s3:ldap: Fix join with don't exists machine account
    
    Add check for requested replies of existing machine object during join
    machine to domain. This solves regression fail during join with error:
    "None of the information to be translated has been translated."
    
    https://bugzilla.samba.org/show_bug.cgi?id=14007
    
    Reviewed-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Wed Sep  4 17:02:37 UTC 2019 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/libads/ldap.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 4f3d43b02b1..2110390b65f 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -2121,13 +2121,14 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
 	}
 
 	ret = ads_find_machine_acct(ads, &res, machine_escaped);
-	ads_msgfree(ads, res);
-	if (ADS_ERR_OK(ret)) {
+	if (ADS_ERR_OK(ret) && ads_count_replies(ads, res) == 1) {
 		DBG_DEBUG("Host account for %s already exists.\n",
 				machine_escaped);
 		ret = ADS_ERROR_LDAP(LDAP_ALREADY_EXISTS);
+		ads_msgfree(ads, res);
 		goto done;
 	}
+	ads_msgfree(ads, res);
 
 	new_dn = talloc_asprintf(ctx, "cn=%s,%s", machine_escaped, org_unit);
 	samAccountName = talloc_asprintf(ctx, "%s$", machine_name);


-- 
Samba Shared Repository