[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  f56ce21 s3:passdb: Fix a memory leak in secrets_fetch_or_upgrade_domain_info()
       via  142f778 vfs_fruit: Unlink memory on error
      from  ad82557 s4: torture: kernel oplocks. Add smb2.kernel-oplocks.kernel_oplocks8

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


- Log -----------------------------------------------------------------
commit f56ce215c7fc957f5e24f015343366239c7fe900
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Nov 2 21:49:43 2017 +0100

    s3:passdb: Fix a memory leak in secrets_fetch_or_upgrade_domain_info()
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Mon Nov 13 14:05:46 CET 2017 on sn-devel-144

commit 142f778c73158b71869fb7051a03d9afad91e77b
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Nov 2 21:48:21 2017 +0100

    vfs_fruit: Unlink memory on error
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 source3/modules/vfs_fruit.c              | 1 +
 source3/passdb/machine_account_secrets.c | 1 +
 2 files changed, 2 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 78170e7..15e42fb 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1078,6 +1078,7 @@ static int ad_convert(struct adouble *ad,
 
 	ok = ad_convert_xattr(ad, smb_fname, map);
 	if (!ok) {
+		munmap(map, origlen);
 		return -1;
 	}
 
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index 75f31cb..40511f9 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -1476,6 +1476,7 @@ NTSTATUS secrets_fetch_or_upgrade_domain_info(const char *domain,
 		DBG_ERR("secrets_domain_info_password_create(pw) failed "
 			"for %s - %s\n", domain, nt_errstr(status));
 		dbwrap_transaction_cancel(db);
+		SAFE_FREE(old_pw);
 		TALLOC_FREE(frame);
 		return status;
 	}


-- 
Samba Shared Repository