diff options
Diffstat (limited to 'source3/lib/replace.c')
| -rw-r--r-- | source3/lib/replace.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/source3/lib/replace.c b/source3/lib/replace.c index 913cd29b23..dfc88e7028 100644 --- a/source3/lib/replace.c +++ b/source3/lib/replace.c @@ -432,23 +432,26 @@ char *rep_inet_ntoa(struct in_addr ip) #ifndef HAVE_TIMEGM /* - yes, I know this looks insane, but its really needed. The function in the - Linux timegm() manpage does not work on solaris. + see the timegm man page on linux */ time_t timegm(struct tm *tm) { - struct tm tm2, tm3; - time_t t; - - tm2 = *tm; - - t = mktime(&tm2); - tm3 = *localtime(&t); - tm2 = *tm; - tm2.tm_isdst = tm3.tm_isdst; - t = mktime(&tm2); - t -= TimeDiff(t); - - return t; + time_t ret; + char *tz; + char *tzvar; + + tz = getenv("TZ"); + putenv("TZ="); + tzset(); + ret = mktime(tm); + if (tz) { + asprintf(&tzvar, "TZ=%s", tz); + putenv(tzvar); + safe_free(tzvar); + } else { + putenv("TZ"); + } + tzset(); + return ret; } #endif |