[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  bf0db7ec dsdb: Do not attempt to return beyond the end of the password history array
      from  f593835 vfs_posixacl: catch ACL_EVERYONE on FreeBSD

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


- Log -----------------------------------------------------------------
commit bf0db7ecc99482784f4cfc77f6603566f581622e
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Sep 2 09:48:34 2014 +1200

    dsdb: Do not attempt to return beyond the end of the password history array
    
    Found by AddressSanitizer
    
    Change-Id: I82e35aea60726053c79510ba8ed3eedfaf553eb7
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Matthieu Patou <mat at matws.net>
    
    Autobuild-User(master): Matthieu Patou <mat at samba.org>
    Autobuild-Date(master): Mon Oct 13 08:28:15 CEST 2014 on sn-devel-104

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

Summary of changes:
 source4/dsdb/common/util.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 409191d..a892f2d 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -570,7 +570,7 @@ NTSTATUS samdb_result_passwords_from_history(TALLOC_CTX *mem_ctx,
 	if (nt_pwd) {
 		unsigned int num_nt;
 		num_nt = samdb_result_hashes(mem_ctx, msg, "ntPwdHistory", &ntPwdHash);
-		if (num_nt < idx) {
+		if (num_nt <= idx) {
 			*nt_pwd = NULL;
 		} else {
 			*nt_pwd = &ntPwdHash[idx];
@@ -583,7 +583,7 @@ NTSTATUS samdb_result_passwords_from_history(TALLOC_CTX *mem_ctx,
 		if (lpcfg_lanman_auth(lp_ctx)) {
 			unsigned int num_lm;
 			num_lm = samdb_result_hashes(mem_ctx, msg, "lmPwdHistory", &lmPwdHash);
-			if (num_lm < idx) {
+			if (num_lm <= idx) {
 				*lm_pwd = NULL;
 			} else {
 				*lm_pwd = &lmPwdHash[idx];


-- 
Samba Shared Repository