summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-08-03 05:47:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:57:45 -0500
commit94fb514376e7cb1c3ba4f89e10289350052d1294 (patch)
treed4eca2537847fa1a391b0777f0d834151fbe8f81 /source4/lib
parent2d9adf1ea5f7928c1f4f14f3f885d688ba5fa744 (diff)
downloadsamba-94fb514376e7cb1c3ba4f89e10289350052d1294.tar.gz
samba-94fb514376e7cb1c3ba4f89e10289350052d1294.tar.bz2
samba-94fb514376e7cb1c3ba4f89e10289350052d1294.zip
r1630: - fixed the replacement timegm() function to work correctly for DST changes
- got rid of global_myname(), using lp_netbios_name() instead (This used to be commit e8d4b390884e487163d81f66a5a7ac1de1305d9a)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/replace.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/source4/lib/replace.c b/source4/lib/replace.c
index c186d307e6..de32d377d5 100644
--- a/source4/lib/replace.c
+++ b/source4/lib/replace.c
@@ -437,7 +437,6 @@ char *rep_inet_ntoa(struct in_addr ip)
{
struct tm tm2, tm3;
time_t t;
- static int zone = -1;
tm2 = *tm;
@@ -446,10 +445,7 @@ char *rep_inet_ntoa(struct in_addr ip)
tm2 = *tm;
tm2.tm_isdst = tm3.tm_isdst;
t = mktime(&tm2);
- if (zone == -1) {
- zone = get_time_zone(t);
- }
- t -= zone;
+ t -= get_time_zone(t);
return t;
}
@@ -472,8 +468,3 @@ char *rep_inet_ntoa(struct in_addr ip)
return ret;
}
#endif
-
-const char *global_myname(void)
-{
- return lp_netbios_name();
-}