[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  60a8ba4 password_hash: Fix the build on FreeBSD
      from  75eb2e3 join.py Add DNS records at domain join time

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


- Log -----------------------------------------------------------------
commit 60a8ba4a6b028d516b39de2f55c68a6e8cbbf43f
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 2 13:34:39 2017 +0200

    password_hash: Fix the build on FreeBSD
    
    This ditches a particular aspect of thread safety, but I doubt that
    ldb is really thread safe. So in practice, I think we should not
    see harm from this.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Tue Jun 13 05:06:49 CEST 2017 on sn-devel-144

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/password_hash.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 8e8dc2c..68028f0 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1543,13 +1543,12 @@ static int setup_primary_userPassword_hash(
 	hash = crypt((char *)io->n.cleartext_utf8->data, cmd);
 #endif
 	if (hash == NULL) {
-		char buf[1024];
 		ldb_asprintf_errstring(
 			ldb,
 			"setup_primary_userPassword: generation of a %s "
 			"password hash failed: (%s)",
 			scheme,
-			strerror_r(errno, buf, sizeof(buf)));
+			strerror(errno));
 		TALLOC_FREE(frame);
 		return LDB_ERR_OPERATIONS_ERROR;
 	}


-- 
Samba Shared Repository