[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  7d846cd178d s3: modules: vfs_glusterfs: Fix leak of char **lines onto mem_ctx on return.
       via  6a9d22f4a91 dsdb/mod/operational: correct comment arithmetic
      from  2a49ccbcf5e s3-vfs_glusterfs: refuse connection when write-behind xlator is present

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


- Log -----------------------------------------------------------------
commit 7d846cd178d653600c71ee4bd6a491a9e48a56da
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 2 15:46:51 2020 -0800

    s3: modules: vfs_glusterfs: Fix leak of char **lines onto mem_ctx on return.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14486
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Nov  3 01:56:59 UTC 2020 on sn-devel-184

commit 6a9d22f4a91e07b8af0f1fb3a7d0cbab2ca0c76f
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Fri Oct 23 16:30:25 2020 +1300

    dsdb/mod/operational: correct comment arithmetic
    
    E + F is not 1F! E + F is 1D!
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 source3/modules/vfs_glusterfs.c              | 2 ++
 source4/dsdb/samdb/ldb_modules/operational.c | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index eea5b30e327..dacedd8e04a 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -338,11 +338,13 @@ static int check_for_write_behind_translator(TALLOC_CTX *mem_ctx,
 			"Please check the vfs_glusterfs(8) manpage for "
 			"further details.\n",
 			volume);
+		TALLOC_FREE(lines);
 		TALLOC_FREE(option);
 		TALLOC_FREE(buf);
 		return -1;
 	}
 
+	TALLOC_FREE(lines);
 	TALLOC_FREE(option);
 	TALLOC_FREE(buf);
 	return 0;
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 50e913cdd5c..3c0bd039d56 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -797,7 +797,10 @@ static NTTIME get_msds_user_password_expiry_time_computed(struct ldb_module *mod
 	 *
 	 * 0x7FFFFFFFFFFFFFFEULL + 0x7FFFFFFFFFFFFFFFULL
 	 * =
-	 * 0xFFFFFFFFFFFFFFFFULL
+	 * 0xFFFFFFFFFFFFFFFDULL
+	 *
+	 * or to put it another way, adding two numbers less than 1<<63 can't
+	 * ever be more than 1<<64, therefore this result can't wrap.
 	 */
 	ret = (NTTIME)pwdLastSet - (NTTIME)maxPwdAge;
 	if (ret >= 0x7FFFFFFFFFFFFFFFULL) {


-- 
Samba Shared Repository