[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3945-g882297e

[Jeremy Allison]

The branch, v3-devel has been updated
       via  882297edc024c146f24fc9f847d2b0b813f93fc7 (commit)
       via  4f60348c0a934123a8e15bc741076366f6713390 (commit)
      from  8343dd5c3a124b9c705f2b71e3747542e193da7e (commit)

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


- Log -----------------------------------------------------------------
commit 882297edc024c146f24fc9f847d2b0b813f93fc7
Merge: 4f60348c0a934123a8e15bc741076366f6713390 8343dd5c3a124b9c705f2b71e3747542e193da7e
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Aug 29 09:29:21 2008 -0700

    Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel

commit 4f60348c0a934123a8e15bc741076366f6713390
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Aug 29 09:29:07 2008 -0700

    Deal with systems that don't initialize birthtime correctly.
    Pointed out by SATOH Fumiyasu <fumiyas at osstech.jp>.
    Jeremy.

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

Summary of changes:
 source/lib/time.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/time.c b/source/lib/time.c
index 3cf0cb4..8cefef6 100644
--- a/source/lib/time.c
+++ b/source/lib/time.c
@@ -860,20 +860,26 @@ struct timespec get_create_timespec(const SMB_STRUCT_STAT *pst,bool fake_dirs)
 	}
 
 #if defined(HAVE_STAT_ST_BIRTHTIMESPEC)
-	return pst->st_birthtimespec;
+	ret = pst->st_birthtimespec;
 #elif defined(HAVE_STAT_ST_BIRTHTIMENSEC)
 	ret.tv_sec = pst->st_birthtime;
 	ret.tv_nsec = pst->st_birthtimenspec;
-	return ret;
 #elif defined(HAVE_STAT_ST_BIRTHTIME)
 	ret.tv_sec = pst->st_birthtime;
 	ret.tv_nsec = 0;
-	return ret;
 #else
 	ret.tv_sec = calc_create_time(pst);
 	ret.tv_nsec = 0;
-	return ret;
 #endif
+
+	/* Deal with systems that don't initialize birthtime correctly.
+	 * Pointed out by SATOH Fumiyasu <fumiyas at osstech.jp>.
+	 */
+	if (null_timespec(ret)) {
+		ret.tv_sec = calc_create_time(pst);
+		ret.tv_nsec = 0;
+	}
+	return ret;
 }
 
 /****************************************************************************


-- 
Samba Shared Repository