diff options
| -rw-r--r-- | source3/lib/replace.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/source3/lib/replace.c b/source3/lib/replace.c index dfc88e7028..913cd29b23 100644 --- a/source3/lib/replace.c +++ b/source3/lib/replace.c @@ -432,26 +432,23 @@ char *rep_inet_ntoa(struct in_addr ip) #ifndef HAVE_TIMEGM /* - see the timegm man page on linux + yes, I know this looks insane, but its really needed. The function in the + Linux timegm() manpage does not work on solaris. */ time_t timegm(struct tm *tm) { - 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; + 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; } #endif |