[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  ba40d0d s3:lib/system fix build on AIX 7
      from  f556e71 Fix bug 9678 - Windows 8 Roaming profiles fail

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


- Log -----------------------------------------------------------------
commit ba40d0d9d320e500621a6a8107a2ef0a34aeb6ba
Author: Christian Ambach <ambi at samba.org>
Date:   Thu Jun 20 18:27:13 2013 +0200

    s3:lib/system fix build on AIX 7
    
    AIX uses struct stat64 with struct timespec64, so direct assignment does
    not work any more.
    
    Pair-Programmed-With: Volker Lendecke <vl at samba.org>
    Signed-off-by: Christian Ambach <ambi at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Aug  2 09:47:43 CEST 2013 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/system.c b/source3/lib/system.c
index 8dbf7dc..8252e4f 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -228,7 +228,10 @@ static struct timespec get_atimespec(const struct stat *pst)
 	return ret;
 #else
 #if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
-	return pst->st_atim;
+	struct timespec ret;
+	ret.tv_sec = pst->st_atim.tv_sec;
+	ret.tv_nsec = pst->st_atim.tv_nsec;
+	return ret;
 #elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
 	struct timespec ret;
 	ret.tv_sec = pst->st_atime;
@@ -263,7 +266,10 @@ static struct timespec get_mtimespec(const struct stat *pst)
 	return ret;
 #else
 #if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
-	return pst->st_mtim;
+	struct timespec ret;
+	ret.tv_sec = pst->st_mtim.tv_sec;
+	ret.tv_nsec = pst->st_mtim.tv_nsec;
+	return ret;
 #elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
 	struct timespec ret;
 	ret.tv_sec = pst->st_mtime;
@@ -298,7 +304,10 @@ static struct timespec get_ctimespec(const struct stat *pst)
 	return ret;
 #else
 #if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
-	return pst->st_ctim;
+	struct timespec ret;
+	ret.tv_sec = pst->st_ctim.tv_sec;
+	ret.tv_nsec = pst->st_ctim.tv_nsec;
+	return ret;
 #elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
 	struct timespec ret;
 	ret.tv_sec = pst->st_ctime;


-- 
Samba Shared Repository