[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  3f8a03c... s3: fix calculation of st_blocks in streams_xattr
      from  1439a1d... s3: Fix EnumDomainAliases when no aliases are in LDAP

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


- Log -----------------------------------------------------------------
commit 3f8a03cfdaa29e54b50738df4e7b782228e2d931
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jun 9 15:24:26 2010 +0200

    s3: fix calculation of st_blocks in streams_xattr
    
    Thanks to Joachim Schmitz for finding that miscalculation.
    (cherry picked from commit 6a6bb768c6542d738a8b2b6da282159a65ed611d)
    
    Fix bug #7503 (vfs_stream_xattr calculates st_blocks wrong).

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index d7c0a83..3f7407a 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -237,7 +237,7 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp,
 	sbuf->st_ex_ino = stream_inode(sbuf, io->xattr_name);
 	sbuf->st_ex_mode &= ~S_IFMT;
         sbuf->st_ex_mode |= S_IFREG;
-        sbuf->st_ex_blocks = sbuf->st_ex_size % STAT_ST_BLOCKSIZE + 1;
+        sbuf->st_ex_blocks = sbuf->st_ex_size / STAT_ST_BLOCKSIZE + 1;
 
 	return 0;
 }
@@ -290,7 +290,7 @@ static int streams_xattr_stat(vfs_handle_struct *handle,
 	smb_fname->st.st_ex_mode &= ~S_IFMT;
         smb_fname->st.st_ex_mode |= S_IFREG;
         smb_fname->st.st_ex_blocks =
-	    smb_fname->st.st_ex_size % STAT_ST_BLOCKSIZE + 1;
+	    smb_fname->st.st_ex_size / STAT_ST_BLOCKSIZE + 1;
 
 	result = 0;
  fail:
@@ -341,7 +341,7 @@ static int streams_xattr_lstat(vfs_handle_struct *handle,
 	smb_fname->st.st_ex_mode &= ~S_IFMT;
         smb_fname->st.st_ex_mode |= S_IFREG;
         smb_fname->st.st_ex_blocks =
-	    smb_fname->st.st_ex_size % STAT_ST_BLOCKSIZE + 1;
+	    smb_fname->st.st_ex_size / STAT_ST_BLOCKSIZE + 1;
 
 	result = 0;
 


-- 
Samba Shared Repository