Cope with changed signature of http_timestring().

19 files changed, 154 insertions, 612 deletions

diff --git a/lib/util/time.c b/lib/util/time.c
index 978d73cc0a..a001e5f66e 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -32,6 +32,14 @@
 #define TIME_T_MIN 0
 #endif
 
+#if (SIZEOF_LONG == 8)
+#define TIME_FIXUP_CONSTANT_INT 11644473600L
+#elif (SIZEOF_LONG_LONG == 8)
+#define TIME_FIXUP_CONSTANT_INT 11644473600LL
+#endif
+
+
+
 /*
  * we use the INT32_MAX here as on 64 bit systems,
  * gmtime() fails with INT64_MAX
@@ -64,27 +72,40 @@ _PUBLIC_ void GetTimeOfDay(struct timeval *tval)
 
 #define TIME_FIXUP_CONSTANT 11644473600LL
 
-/**
-interpret an 8 byte "filetime" structure to a time_t
-It's originally in "100ns units since jan 1st 1601"
-**/
-_PUBLIC_ time_t nt_time_to_unix(NTTIME nt)
+time_t convert_timespec_to_time_t(struct timespec ts)
 {
-	if (nt == 0) {
-		return 0;
-	}
-	if (nt == -1LL) {
-		return (time_t)-1;
+	/* 1 ns == 1,000,000,000 - one thousand millionths of a second.
+	   increment if it's greater than 500 millionth of a second. */
+	if (ts.tv_nsec > 500000000) {
+		return ts.tv_sec + 1;
 	}
-	nt += 1000*1000*10/2;
-	nt /= 1000*1000*10;
-	nt -= TIME_FIXUP_CONSTANT;
+	return ts.tv_sec;
+}
 
-	if (TIME_T_MIN > nt || nt > TIME_T_MAX) {
-		return 0;
-	}
+struct timespec convert_time_t_to_timespec(time_t t)
+{
+	struct timespec ts;
+	ts.tv_sec = t;
+	ts.tv_nsec = 0;
+	return ts;
+}
 
-	return (time_t)nt;
+
+
+/**
+ Interpret an 8 byte "filetime" structure to a time_t
+ It's originally in "100ns units since jan 1st 1601"
+
+ An 8 byte value of 0xffffffffffffffff will be returned as a timespec of
+
+	tv_sec = 0
+	tv_nsec = 0;
+
+ Returns GMT.
+**/
+time_t nt_time_to_unix(NTTIME nt)
+{
+	return convert_timespec_to_time_t(nt_time_to_unix_timespec(&nt));
 }
 
 
@@ -99,14 +120,20 @@ _PUBLIC_ void unix_to_nt_time(NTTIME *nt, time_t t)
 	if (t == (time_t)-1) {
 		*nt = (NTTIME)-1LL;
 		return;
-	}		
+	}	
+
+	if (t == TIME_T_MAX) {
+		*nt = 0x7fffffffffffffffLL;
+		return;
+	}
+
 	if (t == 0) {
 		*nt = 0;
 		return;
 	}		
 
 	t2 = t;
-	t2 += TIME_FIXUP_CONSTANT;
+	t2 += TIME_FIXUP_CONSTANT_INT;
 	t2 *= 1000*1000*10;
 
 	*nt = t2;
@@ -218,7 +245,7 @@ _PUBLIC_ void push_dos_date3(uint8_t *buf,int offset,time_t unixdate, int zone_o
 /*******************************************************************
   interpret a 32 bit dos packed date/time to some parameters
 ********************************************************************/
-static void interpret_dos_date(uint32_t date,int *year,int *month,int *day,int *hour,int *minute,int *second)
+void interpret_dos_date(uint32_t date,int *year,int *month,int *day,int *hour,int *minute,int *second)
 {
 	uint32_t p0,p1,p2,p3;
 
@@ -295,6 +322,10 @@ _PUBLIC_ char *http_timestring(TALLOC_CTX *mem_ctx, time_t t)
 	char tempTime[60];
 	struct tm *tm = localtime(&t);
 
+	if (t == TIME_T_MAX) {
+		return talloc_strdup(mem_ctx, "never");
+	}
+
 	if (!tm) {
 		return talloc_asprintf(mem_ctx,"%ld seconds since the Epoch",(long)t);
 	}
@@ -613,6 +644,50 @@ _PUBLIC_ int get_time_zone(time_t t)
 	return tm_diff(&tm_utc,tm);
 }
 
+struct timespec nt_time_to_unix_timespec(NTTIME *nt)
+{
+	int64_t d;
+	struct timespec ret;
+
+	if (*nt == 0 || *nt == (int64_t)-1) {
+		ret.tv_sec = 0;
+		ret.tv_nsec = 0;
+		return ret;
+	}
+
+	d = (int64_t)*nt;
+	/* d is now in 100ns units, since jan 1st 1601".
+	   Save off the ns fraction. */
+
+	/*
+	 * 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;
+
+	/* Now adjust by 369 years to make the secs since 1970 */
+	d -= TIME_FIXUP_CONSTANT_INT;
+
+	if (d <= (int64_t)TIME_T_MIN) {
+		ret.tv_sec = TIME_T_MIN;
+		ret.tv_nsec = 0;
+		return ret;
+	}
+
+	if (d >= (int64_t)TIME_T_MAX) {
+		ret.tv_sec = TIME_T_MAX;
+		ret.tv_nsec = 0;
+		return ret;
+	}
+
+	ret.tv_sec = (time_t)d;
+	return ret;
+}
+
+
 /**
   check if 2 NTTIMEs are equal.
 */
@@ -620,3 +695,16 @@ bool nt_time_equal(NTTIME *t1, NTTIME *t2)
 {
 	return *t1 == *t2;
 }
+
+/**
+ Check if it's a null timespec.
+**/
+
+bool null_timespec(struct timespec ts)
+{
+	return ts.tv_sec == 0 || 
+		ts.tv_sec == (time_t)0xFFFFFFFF || 
+		ts.tv_sec == (time_t)-1;
+}
+
+
diff --git a/lib/util/time.h b/lib/util/time.h
index e4008c5782..1a1fcc999c 100644
--- a/lib/util/time.h
+++ b/lib/util/time.h
@@ -229,4 +229,9 @@ _PUBLIC_ int get_time_zone(time_t t);
 */
 bool nt_time_equal(NTTIME *t1, NTTIME *t2);
 
+void interpret_dos_date(uint32_t date,int *year,int *month,int *day,int *hour,int *minute,int *second);
+
+
+struct timespec nt_time_to_unix_timespec(NTTIME *nt);
+
 #endif /* _SAMBA_TIME_H_ */
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6ded156e2d..52dcbfb939 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -320,6 +320,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) \
 	  lib/interface.o ../lib/crypto/md4.o \
 	  lib/pidfile.o \
 	  lib/signal.o lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \
+	  ../lib/util/time.o \
 	  lib/ufc.o lib/genrand.o lib/username.o \
 	  lib/util_pw.o lib/access.o lib/smbrun.o \
 	  lib/bitmap.o ../lib/crypto/crc32.o lib/dprintf.o \
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index 50bf15318b..7fe76fbfd6 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -176,7 +176,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
 		/* check for expired password */
 		if (must_change_time < time(NULL) && must_change_time != 0) {
 			DEBUG(1,("sam_account_ok: Account for user '%s' password expired!.\n", pdb_get_username(sampass)));
-			DEBUG(1,("sam_account_ok: Password expired at '%s' (%ld) unix time.\n", http_timestring(must_change_time), (long)must_change_time));
+			DEBUG(1,("sam_account_ok: Password expired at '%s' (%ld) unix time.\n", http_timestring(talloc_tos(), must_change_time), (long)must_change_time));
 			return NT_STATUS_PASSWORD_EXPIRED;
 		}
 	}
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9c8cc7fa33..2935a26f50 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -653,6 +653,8 @@ typedef char fstring[FSTRING_LEN];
 #include "util_tdb.h"
 
 #include "../talloc/talloc.h"
+
+#include "../lib/util/time.h"
 /* And a little extension. Abort on type mismatch */
 #define talloc_get_type_abort(ptr, type) \
 	(type *)talloc_check_name_abort(ptr, #type)
diff --git a/source3/include/proto.h b/source3/include/proto.h
index bf66908fd1..d4b9e67caa 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1127,11 +1127,9 @@ void push_dos_date3(uint8_t *buf,int offset,time_t unixdate, int zone_offset);
 time_t pull_dos_date(const uint8_t *date_ptr, int zone_offset);
 time_t pull_dos_date2(const uint8_t *date_ptr, int zone_offset);
 time_t pull_dos_date3(const uint8_t *date_ptr, int zone_offset);
-char *http_timestring(time_t t);
 char *timestring(TALLOC_CTX *mem_ctx, time_t t);
 const char *nt_time_string(TALLOC_CTX *mem_ctx, NTTIME nt);
 NTTIME nttime_from_string(const char *s);
-int64_t usec_time_diff(struct timeval *tv1, struct timeval *tv2);
 struct timeval timeval_zero(void);
 bool timeval_is_zero(const struct timeval *tv);
 struct timeval timeval_current(void);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index ef98b5e1b5..5062529ade 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -174,9 +174,6 @@ typedef uint32 codepoint_t;
 /* pipe string names */
 #define PIPE_LANMAN   "\\PIPE\\LANMAN"
 
-/* 64 bit time (100usec) since ????? - cifs6.txt, section 3.5, page 30 */
-typedef uint64_t NTTIME;
-
 #define MAX_HOURS_LEN 32
 
 #ifndef MAXSUBAUTHS
diff --git a/source3/lib/events.c b/source3/lib/events.c
index f03138708b..8bbc9497ac 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -436,7 +436,7 @@ void dump_event_list(struct event_context *event_ctx)
 			   te->event_name,
 			   (unsigned long)te,
 			   (int)evt.tv_sec,
-			   http_timestring(te->when.tv_sec)));
+			   http_timestring(talloc_tos(), te->when.tv_sec)));
 	}
 
 	for (fe = event_ctx->fd_events; fe; fe = fe->next) {
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 8cefef6e23..c4aa7d01b3 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -38,112 +38,12 @@
 
 #define NTTIME_INFINITY (NTTIME)0x8000000000000000LL
 
-/***************************************************************************
- External access to time_t_min and time_t_max.
-****************************************************************************/
-
-time_t get_time_t_max(void)
-{
-	return TIME_T_MAX;
-}
-
-/***************************************************************************
- A gettimeofday wrapper.
-****************************************************************************/
-
-void GetTimeOfDay(struct timeval *tval)
-{
-#ifdef HAVE_GETTIMEOFDAY_TZ
-	gettimeofday(tval,NULL);
-#else
-	gettimeofday(tval);
-#endif
-}
-
 #if (SIZEOF_LONG == 8)
 #define TIME_FIXUP_CONSTANT_INT 11644473600L
 #elif (SIZEOF_LONG_LONG == 8)
 #define TIME_FIXUP_CONSTANT_INT 11644473600LL
 #endif
 
-/****************************************************************************
- Interpret an 8 byte "filetime" structure to a time_t
- It's originally in "100ns units since jan 1st 1601"
-
- An 8 byte value of 0xffffffffffffffff will be returned as a timespec of
-
-	tv_sec = 0
-	tv_nsec = 0;
-
- Returns GMT.
-****************************************************************************/
-
-time_t nt_time_to_unix(NTTIME nt)
-{
-	return convert_timespec_to_time_t(nt_time_to_unix_timespec(&nt));
-}
-
-/****************************************************************************
- Put a 8 byte filetime from a time_t. Uses GMT.
-****************************************************************************/
-
-void unix_to_nt_time(NTTIME *nt, time_t t)
-{
-	uint64_t t2; 
-
-	if (t == (time_t)-1) {
-		*nt = (NTTIME)-1LL;
-		return;
-	}	
-
-	if (t == TIME_T_MAX) {
-		*nt = 0x7fffffffffffffffLL;
-		return;
-	}
-
-	if (t == 0) {
-		*nt = 0;
-		return;
-	}		
-
-	t2 = t;
-	t2 += TIME_FIXUP_CONSTANT_INT;
-	t2 *= 1000*1000*10;
-
-	*nt = t2;
-}
-
-/****************************************************************************
- Check if it's a null unix time.
-****************************************************************************/
-
-bool null_time(time_t t)
-{
-	return t == 0 || 
-		t == (time_t)0xFFFFFFFF || 
-		t == (time_t)-1;
-}
-
-/****************************************************************************
- Check if it's a null NTTIME.
-****************************************************************************/
-
-bool null_nttime(NTTIME t)
-{
-	return t == 0 || t == (NTTIME)-1;
-}
-
-/****************************************************************************
- Check if it's a null timespec.
-****************************************************************************/
-
-bool null_timespec(struct timespec ts)
-{
-	return ts.tv_sec == 0 || 
-		ts.tv_sec == (time_t)0xFFFFFFFF || 
-		ts.tv_sec == (time_t)-1;
-}
-
 /*******************************************************************
   create a 16 bit dos packed date
 ********************************************************************/
@@ -193,183 +93,6 @@ static uint32_t make_dos_date(time_t unixdate, int zone_offset)
 }
 
 /**
-put a dos date into a buffer (time/date format)
-This takes GMT time and puts local time in the buffer
-**/
-void push_dos_date(uint8_t *buf, int offset, time_t unixdate, int zone_offset)
-{
-	uint32_t x = make_dos_date(unixdate, zone_offset);
-	SIVAL(buf,offset,x);
-}
-
-/**
-put a dos date into a buffer (date/time format)
-This takes GMT time and puts local time in the buffer
-**/
-void push_dos_date2(uint8_t *buf,int offset,time_t unixdate, int zone_offset)
-{
-	uint32_t x;
-	x = make_dos_date(unixdate, zone_offset);
-	x = ((x&0xFFFF)<<16) | ((x&0xFFFF0000)>>16);
-	SIVAL(buf,offset,x);
-}
-
-/**
-put a dos 32 bit "unix like" date into a buffer. This routine takes
-GMT and converts it to LOCAL time before putting it (most SMBs assume
-localtime for this sort of date)
-**/
-void push_dos_date3(uint8_t *buf,int offset,time_t unixdate, int zone_offset)
-{
-	if (!null_time(unixdate)) {
-		unixdate -= zone_offset;
-	}
-	SIVAL(buf,offset,unixdate);
-}
-
-/*******************************************************************
-  interpret a 32 bit dos packed date/time to some parameters
-********************************************************************/
-static void interpret_dos_date(uint32_t date,int *year,int *month,int *day,int *hour,int *minute,int *second)
-{
-	uint32_t p0,p1,p2,p3;
-
-	p0=date&0xFF; p1=((date&0xFF00)>>8)&0xFF; 
-	p2=((date&0xFF0000)>>16)&0xFF; p3=((date&0xFF000000)>>24)&0xFF;
-
-	*second = 2*(p0 & 0x1F);
-	*minute = ((p0>>5)&0xFF) + ((p1&0x7)<<3);
-	*hour = (p1>>3)&0xFF;
-	*day = (p2&0x1F);
-	*month = ((p2>>5)&0xFF) + ((p3&0x1)<<3) - 1;
-	*year = ((p3>>1)&0xFF) + 80;
-}
-
-/**
-  create a unix date (int GMT) from a dos date (which is actually in
-  localtime)
-**/
-time_t pull_dos_date(const uint8_t *date_ptr, int zone_offset)
-{
-	uint32_t dos_date=0;
-	struct tm t;
-	time_t ret;
-
-	dos_date = IVAL(date_ptr,0);
-
-	if (dos_date == 0) return (time_t)0;
-  
-	interpret_dos_date(dos_date,&t.tm_year,&t.tm_mon,
-			   &t.tm_mday,&t.tm_hour,&t.tm_min,&t.tm_sec);
-	t.tm_isdst = -1;
-  
-	ret = timegm(&t);
-
-	ret += zone_offset;
-
-	return ret;
-}
-
-/**
-like make_unix_date() but the words are reversed
-**/
-time_t pull_dos_date2(const uint8_t *date_ptr, int zone_offset)
-{
-	uint32_t x,x2;
-
-	x = IVAL(date_ptr,0);
-	x2 = ((x&0xFFFF)<<16) | ((x&0xFFFF0000)>>16);
-	SIVAL(&x,0,x2);
-
-	return pull_dos_date((const uint8_t *)&x, zone_offset);
-}
-
-/**
-  create a unix GMT date from a dos date in 32 bit "unix like" format
-  these generally arrive as localtimes, with corresponding DST
-**/
-time_t pull_dos_date3(const uint8_t *date_ptr, int zone_offset)
-{
-	time_t t = (time_t)IVAL(date_ptr,0);
-	if (!null_time(t)) {
-		t += zone_offset;
-	}
-	return t;
-}
-
-/***************************************************************************
- Return a HTTP/1.0 time string.
-***************************************************************************/
-
-char *http_timestring(time_t t)
-{
-	fstring buf;
-	struct tm *tm = localtime(&t);
-
-	if (t == TIME_T_MAX) {
-		fstrcpy(buf, "never");
-	} else if (!tm) {
-		fstr_sprintf(buf, "%ld seconds since the Epoch", (long)t);
-	} else {
-#ifndef HAVE_STRFTIME
-		const char *asct = asctime(tm);
-		fstrcpy(buf, asct ? asct : "unknown");
-	}
-	if(buf[strlen(buf)-1] == '\n') {
-		buf[strlen(buf)-1] = 0;
-#else /* !HAVE_STRFTIME */
-		strftime(buf, sizeof(buf)-1, "%a, %d %b %Y %H:%M:%S %Z", tm);
-#endif /* !HAVE_STRFTIME */
-	}
-	return talloc_strdup(talloc_tos(), buf);
-}
-
-
-/**
- Return the date and time as a string
-**/
-char *timestring(TALLOC_CTX *mem_ctx, time_t t)
-{
-	char *TimeBuf;
-	char tempTime[80];
-	struct tm *tm;
-
-	tm = localtime(&t);
-	if (!tm) {
-		return talloc_asprintf(mem_ctx,
-				       "%ld seconds since the Epoch",
-				       (long)t);
-	}
-
-#ifdef HAVE_STRFTIME
-	/* some versions of gcc complain about using %c. This is a bug
-	   in the gcc warning, not a bug in this code. See a recent
-	   strftime() manual page for details.
-	 */
-	strftime(tempTime,sizeof(tempTime)-1,"%c %Z",tm);
-	TimeBuf = talloc_strdup(mem_ctx, tempTime);
-#else
-	TimeBuf = talloc_strdup(mem_ctx, asctime(tm));
-#endif
-
-	return TimeBuf;
-}
-
-/**
-  return a talloced string representing a NTTIME for human consumption
-*/
-const char *nt_time_string(TALLOC_CTX *mem_ctx, NTTIME nt)
-{
-	time_t t;
-	if (nt == 0) {
-		return "NTTIME(0)";
-	}
-	t = nt_time_to_unix(nt);
-	return timestring(mem_ctx, t);
-}
-
-
-/**
   parse a nttime as a large integer in a string and return a NTTIME
 */
 NTTIME nttime_from_string(const char *s)
@@ -377,190 +100,6 @@ NTTIME nttime_from_string(const char *s)
 	return strtoull(s, NULL, 0);
 }
 
-/**
-  return (tv1 - tv2) in microseconds
-*/
-int64_t usec_time_diff(struct timeval *tv1, struct timeval *tv2)
-{
-	int64_t sec_diff = tv1->tv_sec - tv2->tv_sec;
-	return (sec_diff * 1000000) + (int64_t)(tv1->tv_usec - tv2->tv_usec);
-}
-
-
-/**
-  return a zero timeval
-*/
-struct timeval timeval_zero(void)
-{
-	struct timeval tv;
-	tv.tv_sec = 0;
-	tv.tv_usec = 0;
-	return tv;
-}
-
-/**
-  return True if a timeval is zero
-*/
-bool timeval_is_zero(const struct timeval *tv)
-{
-	return tv->tv_sec == 0 && tv->tv_usec == 0;
-}
-
-/**
-  return a timeval for the current time
-*/
-struct timeval timeval_current(void)
-{
-	struct timeval tv;
-	GetTimeOfDay(&tv);
-	return tv;
-}
-
-/**
-  return a timeval struct with the given elements
-*/
-struct timeval timeval_set(uint32_t secs, uint32_t usecs)
-{
-	struct timeval tv;
-	tv.tv_sec = secs;
-	tv.tv_usec = usecs;
-	return tv;
-}
-
-
-/**
-  return a timeval ofs microseconds after tv
-*/
-struct timeval timeval_add(const struct timeval *tv,
-			   uint32_t secs, uint32_t usecs)
-{
-	struct timeval tv2 = *tv;
-	const unsigned int million = 1000000;
-	tv2.tv_sec += secs;
-	tv2.tv_usec += usecs;
-	tv2.tv_sec += tv2.tv_usec / million;
-	tv2.tv_usec = tv2.tv_usec % million;
-	return tv2;
-}
-
-/**
-  return the sum of two timeval structures
-*/
-struct timeval timeval_sum(const struct timeval *tv1,
-			   const struct timeval *tv2)
-{
-	return timeval_add(tv1, tv2->tv_sec, tv2->tv_usec);
-}
-
-/**
-  return a timeval secs/usecs into the future
-*/
-struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs)
-{
-	struct timeval tv = timeval_current();
-	return timeval_add(&tv, secs, usecs);
-}
-
-/**
-  compare two timeval structures. 
-  Return -1 if tv1 < tv2
-  Return 0 if tv1 == tv2
-  Return 1 if tv1 > tv2
-*/
-int timeval_compare(const struct timeval *tv1, const struct timeval *tv2)
-{
-	if (tv1->tv_sec  > tv2->tv_sec)  return 1;
-	if (tv1->tv_sec  < tv2->tv_sec)  return -1;
-	if (tv1->tv_usec > tv2->tv_usec) return 1;
-	if (tv1->tv_usec < tv2->tv_usec) return -1;
-	return 0;
-}
-
-/**
-  return True if a timer is in the past
-*/
-bool timeval_expired(const struct timeval *tv)
-{
-	struct timeval tv2 = timeval_current();
-	if (tv2.tv_sec > tv->tv_sec) return True;
-	if (tv2.tv_sec < tv->tv_sec) return False;
-	return (tv2.tv_usec >= tv->tv_usec);
-}
-
-/**
-  return the number of seconds elapsed between two times
-*/
-double timeval_elapsed2(const struct timeval *tv1, const struct timeval *tv2)
-{
-	return (tv2->tv_sec - tv1->tv_sec) + 
-	       (tv2->tv_usec - tv1->tv_usec)*1.0e-6;
-}
-
-/**
-  return the number of seconds elapsed since a given time
-*/
-double timeval_elapsed(const struct timeval *tv)
-{
-	struct timeval tv2 = timeval_current();
-	return timeval_elapsed2(tv, &tv2);
-}
-
-/**
-  return the lesser of two timevals
-*/
-struct timeval timeval_min(const struct timeval *tv1,
-			   const struct timeval *tv2)
-{
-	if (tv1->tv_sec < tv2->tv_sec) return *tv1;
-	if (tv1->tv_sec > tv2->tv_sec) return *tv2;
-	if (tv1->tv_usec < tv2->tv_usec) return *tv1;
-	return *tv2;
-}
-
-/**
-  return the greater of two timevals
-*/
-struct timeval timeval_max(const struct timeval *tv1,
-			   const struct timeval *tv2)
-{
-	if (tv1->tv_sec > tv2->tv_sec) return *tv1;
-	if (tv1->tv_sec < tv2->tv_sec) return *tv2;
-	if (tv1->tv_usec > tv2->tv_usec) return *tv1;
-	return *tv2;
-}
-
-/**
-  return the difference between two timevals as a timeval
-  if tv1 comes after tv2, then return a zero timeval
-  (this is *tv2 - *tv1)
-*/
-struct timeval timeval_until(const struct timeval *tv1,
-			     const struct timeval *tv2)
-{
-	struct timeval t;
-	if (timeval_compare(tv1, tv2) >= 0) {
-		return timeval_zero();
-	}
-	t.tv_sec = tv2->tv_sec - tv1->tv_sec;
-	if (tv1->tv_usec > tv2->tv_usec) {
-		t.tv_sec--;
-		t.tv_usec = 1000000 - (tv1->tv_usec - tv2->tv_usec);
-	} else {
-		t.tv_usec = tv2->tv_usec - tv1->tv_usec;
-	}
-	return t;
-}
-
-
-/**
-  convert a timeval to a NTTIME
-*/
-NTTIME timeval_to_nttime(const struct timeval *tv)
-{
-	return 10*(tv->tv_usec + 
-		  ((TIME_FIXUP_CONSTANT_INT + (uint64_t)tv->tv_sec) * 1000000));
-}
-
 /**************************************************************
  Handle conversions between time_t and uint32, taking care to
  preserve the "special" values.
@@ -592,44 +131,8 @@ time_t convert_uint32_to_time_t(uint32 u)
 	return (time_t)u;
 }
 
-/*******************************************************************
- Yield the difference between *A and *B, in seconds, ignoring leap seconds.
-********************************************************************/
-
-static int tm_diff(struct tm *a, struct tm *b)
-{
-	int ay = a->tm_year + (1900 - 1);
-	int by = b->tm_year + (1900 - 1);
-	int intervening_leap_days =
-		(ay/4 - by/4) - (ay/100 - by/100) + (ay/400 - by/400);
-	int years = ay - by;
-	int days = 365*years + intervening_leap_days + (a->tm_yday - b->tm_yday);
-	int hours = 24*days + (a->tm_hour - b->tm_hour);
-	int minutes = 60*hours + (a->tm_min - b->tm_min);
-	int seconds = 60*minutes + (a->tm_sec - b->tm_sec);
-
-	return seconds;
-}
-
 int extra_time_offset=0;
 
-/*******************************************************************
- Return the UTC offset in seconds west of UTC, or 0 if it cannot be determined.
-********************************************************************/
-
-int get_time_zone(time_t t)
-{
-	struct tm *tm = gmtime(&t);
-	struct tm tm_utc;
-	if (!tm)
-		return 0;
-	tm_utc = *tm;
-	tm = localtime(&t);
-	if (!tm)
-		return 0;
-	return tm_diff(&tm_utc,tm)+60*extra_time_offset;
-}
-
 /****************************************************************************
  Check if NTTIME is 0.
 ****************************************************************************/
@@ -1084,24 +587,6 @@ time_t srv_make_unix_date3(const void *date_ptr)
 	return make_unix_date3(date_ptr, server_zone_offset);
 }
 
-time_t convert_timespec_to_time_t(struct timespec ts)
-{
-	/* 1 ns == 1,000,000,000 - one thousand millionths of a second.
-	   increment if it's greater than 500 millionth of a second. */
-	if (ts.tv_nsec > 500000000) {
-		return ts.tv_sec + 1;
-	}
-	return ts.tv_sec;
-}
-
-struct timespec convert_time_t_to_timespec(time_t t)
-{
-	struct timespec ts;
-	ts.tv_sec = t;
-	ts.tv_nsec = 0;
-	return ts;
-}
-
 /****************************************************************************
  Convert a normalized timeval to a timespec.
 ****************************************************************************/
@@ -1222,49 +707,6 @@ time_t cli_make_unix_date3(struct cli_state *cli, const void *date_ptr)
 	return make_unix_date3(date_ptr, cli->serverzone);
 }
 
-/* Large integer version. */
-struct timespec nt_time_to_unix_timespec(NTTIME *nt)
-{
-	int64 d;
-	struct timespec ret;
-
-	if (*nt == 0 || *nt == (int64)-1) {
-		ret.tv_sec = 0;
-		ret.tv_nsec = 0;
-		return ret;
-	}
-
-	d = (int64)*nt;
-	/* d is now in 100ns units, since jan 1st 1601".
-	   Save off the ns fraction. */
-
-	/*
-	 * 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;
-
-	/* Now adjust by 369 years to make the secs since 1970 */
-	d -= TIME_FIXUP_CONSTANT_INT;
-
-	if (d <= (int64)TIME_T_MIN) {
-		ret.tv_sec = TIME_T_MIN;
-		ret.tv_nsec = 0;
-		return ret;
-	}
-
-	if (d >= (int64)TIME_T_MAX) {
-		ret.tv_sec = TIME_T_MAX;
-		ret.tv_nsec = 0;
-		return ret;
-	}
-
-	ret.tv_sec = (time_t)d;
-	return ret;
-}
 /****************************************************************************
  Check if two NTTIMEs are the same.
 ****************************************************************************/
diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c
index 40f051c851..5a7bd24507 100644
--- a/source3/libads/authdata.c
+++ b/source3/libads/authdata.c
@@ -403,12 +403,12 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
 	DEBUG(10,("got TGT for %s in %s\n", auth_princ, cc));
 	if (expire_time) {
 		DEBUGADD(10,("\tvalid until: %s (%d)\n",
-			http_timestring(*expire_time),
+			http_timestring(talloc_tos(), *expire_time),
 			(int)*expire_time));
 	}
 	if (renew_till_time) {
 		DEBUGADD(10,("\trenewable till: %s (%d)\n",
-			http_timestring(*renew_till_time),
+			http_timestring(talloc_tos(), *renew_till_time),
 			(int)*renew_till_time));
 	}
 
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index b8afb57977..790e8d5369 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -607,7 +607,7 @@ static bool ads_cleanup_expired_creds(krb5_context context,
 
 	DEBUG(3, ("ads_cleanup_expired_creds: Ticket in ccache[%s:%s] expiration %s\n",
 		  cc_type, krb5_cc_get_name(context, ccache),
-		  http_timestring(credsp->times.endtime)));
+		  http_timestring(talloc_tos(), credsp->times.endtime)));
 
 	/* we will probably need new tickets if the current ones
 	   will expire within 10 seconds.
@@ -704,7 +704,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
 
 	DEBUG(10,("ads_krb5_mk_req: Ticket (%s) in ccache (%s:%s) is valid until: (%s - %u)\n",
 		  principal, krb5_cc_get_type(context, ccache), krb5_cc_get_name(context, ccache),
-		  http_timestring((unsigned)credsp->times.endtime), 
+		  http_timestring(talloc_tos(), (unsigned)credsp->times.endtime), 
 		  (unsigned)credsp->times.endtime));
 
 	if (expire_time) {
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index 2a324fdd5c..0c05915bd8 100644
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -104,7 +104,7 @@ static int generic_job_delete( const char *sharename, const char *lprm_command,
 	slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
 	return print_run_command( -1, sharename, False, lprm_command, NULL,
 		   "%j", jobstr,
-		   "%T", http_timestring(pjob->starttime),
+		   "%T", http_timestring(talloc_tos(), pjob->starttime),
 		   NULL);
 }
 
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index fa1e0fda4d..133a7e04c3 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -79,17 +79,17 @@ static void display_samr_user_info_21(struct samr_UserInfo21 *r)
 	dump_data(0, (uint8_t *)r->parameters.array, r->parameters.length*2);
 
 	printf("\tLogon Time               :\t%s\n",
-	       http_timestring(nt_time_to_unix(r->last_logon)));
+	       http_timestring(talloc_tos(), nt_time_to_unix(r->last_logon)));
 	printf("\tLogoff Time              :\t%s\n",
-	       http_timestring(nt_time_to_unix(r->last_logoff)));
+	       http_timestring(talloc_tos(), nt_time_to_unix(r->last_logoff)));
 	printf("\tKickoff Time             :\t%s\n",
-	       http_timestring(nt_time_to_unix(r->acct_expiry)));
+	       http_timestring(talloc_tos(), nt_time_to_unix(r->acct_expiry)));
 	printf("\tPassword last set Time   :\t%s\n",
-	       http_timestring(nt_time_to_unix(r->last_password_change)));
+	       http_timestring(talloc_tos(), nt_time_to_unix(r->last_password_change)));
 	printf("\tPassword can change Time :\t%s\n",
-	       http_timestring(nt_time_to_unix(r->allow_password_change)));
+	       http_timestring(talloc_tos(), nt_time_to_unix(r->allow_password_change)));
 	printf("\tPassword must change Time:\t%s\n",
-	       http_timestring(nt_time_to_unix(r->force_password_change)));
+	       http_timestring(talloc_tos(), nt_time_to_unix(r->force_password_change)));
 
 	printf("\tunknown_2[0..31]...\n"); /* user passwords? */
 
@@ -196,7 +196,7 @@ static void display_sam_dom_info_8(struct samr_DomInfo8 *info8)
 {
 	printf("Sequence No:\t%llu\n", (unsigned long long)info8->sequence_num);
 	printf("Domain Create Time:\t%s\n",
-		http_timestring(nt_time_to_unix(info8->domain_create_time)));
+		http_timestring(talloc_tos(), nt_time_to_unix(info8->domain_create_time)));
 }
 
 static void display_sam_dom_info_9(struct samr_DomInfo9 *info9)
@@ -218,7 +218,7 @@ static void display_sam_dom_info_13(struct samr_DomInfo13 *info13)
 {
 	printf("Sequence No:\t%llu\n", (unsigned long long)info13->sequence_num);
 	printf("Domain Create Time:\t%s\n",
-		http_timestring(nt_time_to_unix(info13->domain_create_time)));
+		http_timestring(talloc_tos(), nt_time_to_unix(info13->domain_create_time)));
 	printf("Unknown1:\t%d\n", info13->unknown1);
 	printf("Unknown2:\t%d\n", info13->unknown2);
 
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c
index 2596e73380..64a4311256 100644
--- a/source3/smbd/chgpasswd.c
+++ b/source3/smbd/chgpasswd.c
@@ -1131,7 +1131,7 @@ NTSTATUS change_oem_password(struct samu *hnd, char *old_passwd, char *new_passw
 	if ((can_change_time != 0) && (time(NULL) < can_change_time)) {
 		DEBUG(1, ("user %s cannot change password now, must "
 			  "wait until %s\n", username,
-			  http_timestring(can_change_time)));
+			  http_timestring(talloc_tos(), can_change_time)));
 		if (samr_reject_reason) {
 			*samr_reject_reason = SAMR_REJECT_OTHER;
 		}
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 627374cb96..30c47ddd34 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -182,7 +182,8 @@ static int net_ads_info(struct net_context *c, int argc, const char **argv)
 	d_printf("Realm: %s\n", ads->config.realm);
 	d_printf("Bind Path: %s\n", ads->config.bind_path);
 	d_printf("LDAP port: %d\n", ads->ldap.port);
-	d_printf("Server time: %s\n", http_timestring(ads->config.current_time));
+	d_printf("Server time: %s\n", 
+			 http_timestring(talloc_tos(), ads->config.current_time));
 
 	d_printf("KDC server: %s\n", ads->auth.kdc_server );
 	d_printf("Server time offset: %d\n", ads->auth.time_offset );
diff --git a/source3/utils/net_registry_util.c b/source3/utils/net_registry_util.c
index 278377867a..cd291b5c74 100644
--- a/source3/utils/net_registry_util.c
+++ b/source3/utils/net_registry_util.c
@@ -27,7 +27,7 @@ void print_registry_key(const char *keyname, NTTIME *modtime)
 	d_printf("Keyname   = %s\n", keyname);
 	d_printf("Modtime   = %s\n",
 		 modtime
-		 ? http_timestring(nt_time_to_unix(*modtime))
+		 ? http_timestring(talloc_tos(), nt_time_to_unix(*modtime))
 		 : "None");
 	d_printf("\n");
 }
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index e1d6709073..6a7189e636 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -235,7 +235,7 @@ static int print_sam_info (struct samu *sam_pwent, bool verbosity, bool smbpwdst
 	uid_t uid;
 	time_t tmp;
 
-	/* TODO: chaeck if entry is a user or a workstation */
+	/* TODO: check if entry is a user or a workstation */
 	if (!sam_pwent) return -1;
 
 	if (verbosity) {
@@ -260,25 +260,32 @@ static int print_sam_info (struct samu *sam_pwent, bool verbosity, bool smbpwdst
 		printf ("Munged dial:          %s\n", pdb_get_munged_dial(sam_pwent));
 
 		tmp = pdb_get_logon_time(sam_pwent);
-		printf ("Logon time:           %s\n", tmp ? http_timestring(tmp) : "0");
+		printf ("Logon time:           %s\n", 
+				tmp ? http_timestring(talloc_tos(), tmp) : "0");
 
 		tmp = pdb_get_logoff_time(sam_pwent);
-		printf ("Logoff time:          %s\n", tmp ? http_timestring(tmp) : "0");
+		printf ("Logoff time:          %s\n", 
+				tmp ? http_timestring(talloc_tos(), tmp) : "0");
 
 		tmp = pdb_get_kickoff_time(sam_pwent);
-		printf ("Kickoff time:         %s\n", tmp ? http_timestring(tmp) : "0");
+		printf ("Kickoff time:         %s\n", 
+				tmp ? http_timestring(talloc_tos(), tmp) : "0");
 
 		tmp = pdb_get_pass_last_set_time(sam_pwent);
-		printf ("Password last set:    %s\n", tmp ? http_timestring(tmp) : "0");
+		printf ("Password last set:    %s\n", 
+				tmp ? http_timestring(talloc_tos(), tmp) : "0");
 
 		tmp = pdb_get_pass_can_change_time(sam_pwent);
-		printf ("Password can change:  %s\n", tmp ? http_timestring(tmp) : "0");
+		printf ("Password can change:  %s\n", 
+				tmp ? http_timestring(talloc_tos(), tmp) : "0");
 
 		tmp = pdb_get_pass_must_change_time(sam_pwent);
-		printf ("Password must change: %s\n", tmp ? http_timestring(tmp) : "0");
+		printf ("Password must change: %s\n", 
+				tmp ? http_timestring(talloc_tos(), tmp) : "0");
 
 		tmp = pdb_get_bad_password_time(sam_pwent);
-		printf ("Last bad password   : %s\n", tmp ? http_timestring(tmp) : "0");
+		printf ("Last bad password   : %s\n", 
+				tmp ? http_timestring(talloc_tos(), tmp) : "0");
 		printf ("Bad password count  : %d\n",
 			pdb_get_bad_password_count(sam_pwent));
 
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 070e80cf91..7e689bcce8 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -488,7 +488,8 @@ static void cgi_download(char *file)
 			printf("Content-Type: text/html\r\n");
 		}
 	}
-	printf("Expires: %s\r\n", http_timestring(time(NULL)+EXPIRY_TIME));
+	printf("Expires: %s\r\n", 
+		   http_timestring(talloc_tos(), time(NULL)+EXPIRY_TIME));
 
 	lang = lang_tdb_current();
 	if (lang) {
@@ -604,7 +605,7 @@ void cgi_setup(const char *rootdir, int auth_required)
 	}
 
 	printf("HTTP/1.0 200 OK\r\nConnection: close\r\n");
-	printf("Date: %s\r\n", http_timestring(time(NULL)));
+	printf("Date: %s\r\n", http_timestring(talloc_tos(), time(NULL)));
 	baseurl = "";
 	pathinfo = url+1;
 }
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index aeb52d9b5a..994c94b5be 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -905,7 +905,7 @@ static bool calculate_next_machine_pwd_change(const char *domain,
 	if (time(NULL) < (pass_last_set_time + timeout)) {
 		next_change = pass_last_set_time + timeout;
 		DEBUG(10,("machine password still valid until: %s\n",
-			http_timestring(next_change)));
+			http_timestring(talloc_tos(), next_change)));
 		*t = timeval_set(next_change, 0);
 		return true;
 	}