[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3927-gad6c85f

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  ad6c85f4cbfdcfab32a95250550b22acf1084498 (commit)
       via  21d067c5dbf1e5b7233e9af9c60df25403f79afb (commit)
      from  2fa3bf836cfa7108e4f47314c58a70218f8cf31a (commit)

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


- Log -----------------------------------------------------------------
commit ad6c85f4cbfdcfab32a95250550b22acf1084498
Merge: 21d067c5dbf1e5b7233e9af9c60df25403f79afb 2fa3bf836cfa7108e4f47314c58a70218f8cf31a
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Aug 29 09:29:26 2008 -0700

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

commit 21d067c5dbf1e5b7233e9af9c60df25403f79afb
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Aug 29 09:28:51 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