[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-29-57-gd183dc6

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  d183dc676db0d91ae6b0759c8fd094c4a888d29d (commit)
      from  3e0a19a9494dd7ce95e563476d0d2af81aa196e8 (commit)

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


- Log -----------------------------------------------------------------
commit d183dc676db0d91ae6b0759c8fd094c4a888d29d
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jun 20 13:23:31 2008 -0700

    Fix bug #5531 - fix conversion of ns units when converting from nttime to timespec.
    Fix from hkurma at datadomain.com.
    Jeremy.

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

Summary of changes:
 source/lib/time.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/time.c b/source/lib/time.c
index a703066..8e28fcc 100644
--- a/source/lib/time.c
+++ b/source/lib/time.c
@@ -1212,8 +1212,12 @@ struct timespec nt_time_to_unix_timespec(NTTIME *nt)
 	d = (int64)*nt;
 	/* d is now in 100ns units, since jan 1st 1601".
 	   Save off the ns fraction. */
-	
-	ret.tv_nsec = (long) ((d % 100) * 100);
+
+	/*
+	 * Take the last seven decimal digits and multiply by 100.
+	 * to convert from 100ns units to 1ns units.
+	 */
+        ret.tv_nsec = (long) ((d % (1000 * 1000 * 10)) * 100);
 
 	/* Convert to seconds */
 	d /= 1000*1000*10;


-- 
Samba Shared Repository