[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1296-gff93551

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  ff9355149c9af7ca0e31b36690b270a03cb787fc (commit)
      from  9c86a96af381f2826456f91eb99073c9fca633de (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit ff9355149c9af7ca0e31b36690b270a03cb787fc
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Sep 16 03:20:49 2009 +0200

    s3: Fix reading beyond the end of a named stream in xattr_streams
    
    This was found thanks to a test by Sivani from Microsoft against Samba at the
    SDC plugfest
    (cherry picked from commit 444a05c28df693a745809fef73ae583a78be7c8f)
    
    Fix bug #6731.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index 3d5478d..c5a7c69 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -867,8 +867,7 @@ static ssize_t streams_xattr_pread(vfs_handle_struct *handle,
 
         /* Attempt to read past EOF. */
         if (length <= offset) {
-                errno = EINVAL;
-                return -1;
+                return 0;
         }
 
         overlap = (offset + n) > length ? (length - offset) : n;


-- 
Samba Shared Repository