[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  7f976f4 s3: smbd: vfs_dirsort module.
      from  80f00ea ctdb-build: SAMBA_BINARY targets should not include bin/ prefix

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


- Log -----------------------------------------------------------------
commit 7f976f42c471b3297236081c6bc0e790dc9ea69f
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 3 07:54:51 2014 -0700

    s3: smbd: vfs_dirsort module.
    
    Fix an off-by-one check that would cause seekdir to
    seek off the end of the cached array.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ronnie Sahlberg <ronniesahlberg.gmail.com>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Sep  3 19:59:54 CEST 2014 on sn-devel-104

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

Summary of changes:
 source3/modules/vfs_dirsort.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index 98109c2..d6b3394 100644
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -256,7 +256,7 @@ static void dirsort_seekdir(vfs_handle_struct *handle, DIR *dirp,
 	if (data == NULL) {
 		return;
 	}
-	if (offset > data->number_of_entries) {
+	if (offset >= data->number_of_entries) {
 		return;
 	}
 	data->pos = offset;


-- 
Samba Shared Repository