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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  18516e0 s3: fix build on platforms without st_blocks and st_blksize 
stat struct members
      from  24f9210 Fix bug #7693 - smbd changing mode of files on rename

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


- Log -----------------------------------------------------------------
commit 18516e062c9c4fc2a61a7ef7c8b173683c02e2e8
Author: Björn Jacke <b...@sernet.de>
Date:   Mon Jun 7 23:06:28 2010 +0200

    s3: fix build on platforms without st_blocks and st_blksize stat struct 
members
    
    This fixes bug 7474.

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

Summary of changes:
 source3/lib/system.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/system.c b/source3/lib/system.c
index a58d903..1ce635f 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -534,8 +534,17 @@ static void init_stat_ex_from_stat (struct stat_ex *dst,
        dst->st_ex_mtime = get_mtimespec(src);
        dst->st_ex_ctime = get_ctimespec(src);
        make_create_timespec(src, dst, fake_dir_create_times);
+#ifdef HAVE_STAT_ST_BLKSIZE
        dst->st_ex_blksize = src->st_blksize;
+#else
+       dst->st_ex_blksize = STAT_ST_BLOCKSIZE;
+#endif
+
+#ifdef HAVE_STAT_ST_BLOCKS
        dst->st_ex_blocks = src->st_blocks;
+#else
+       dst->st_ex_blocks = src->st_size / dst->st_ex_blksize + 1;
+#endif
 
 #ifdef HAVE_STAT_ST_FLAGS
        dst->st_ex_flags = src->st_flags;


-- 
Samba Shared Repository