diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-11 09:49:12 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-11 03:54:44 +0200 |
| commit | 530e4cac2e93177923080daa5ec1bac2c65d269b (patch) | |
| tree | 088e79b4d28869fb4c51b1cbdfc7ca852bbc1f35 /lib | |
| parent | 35aeeab29dc414bff9123d8cf059e981397cae79 (diff) | |
| download | samba-530e4cac2e93177923080daa5ec1bac2c65d269b.tar.gz samba-530e4cac2e93177923080daa5ec1bac2c65d269b.tar.xz samba-530e4cac2e93177923080daa5ec1bac2c65d269b.zip | |
s3-param Remove 'time offset' from smb.conf
This strange parameter is apparently very rarely used, and it seems to
me that on modern networks, if clients don't have correct clocks and
DST offsets, that many other things (Kerberos) start to fail pretty
quickly, and time and DST tables tend to be internet delivered anyway.
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sat Jun 11 03:54:45 CEST 2011 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/util/tests/time.c | 18 | ||||
| -rw-r--r-- | lib/util/time.c | 4 | ||||
| -rw-r--r-- | lib/util/time.h | 3 |
3 files changed, 1 insertions, 24 deletions
diff --git a/lib/util/tests/time.c b/lib/util/tests/time.c index 592f88f88bd..a8b26762e31 100644 --- a/lib/util/tests/time.c +++ b/lib/util/tests/time.c @@ -81,29 +81,11 @@ static bool test_timestring(struct torture_context *tctx) return true; } -static bool test_get_time_zone(struct torture_context *tctx) -{ - time_t t = time(NULL); - int old_extra_time_offset = extra_time_offset; - int old_offset, new_offset; - /* test that extra_time_offset works */ - - old_offset = get_time_zone(t); - extra_time_offset = 42; - new_offset = get_time_zone(t); - extra_time_offset = old_extra_time_offset; - torture_assert_int_equal(tctx, old_offset+60*42, new_offset, - "time offset not used"); - return true; -} - - struct torture_suite *torture_local_util_time(TALLOC_CTX *mem_ctx) { struct torture_suite *suite = torture_suite_create(mem_ctx, "time"); torture_suite_add_simple_test(suite, "null_time", test_null_time); - torture_suite_add_simple_test(suite, "get_time_zone", test_get_time_zone); torture_suite_add_simple_test(suite, "null_nttime", test_null_nttime); torture_suite_add_simple_test(suite, "http_timestring", test_http_timestring); diff --git a/lib/util/time.c b/lib/util/time.c index d8fd4a3dfcc..31aa05cd0f5 100644 --- a/lib/util/time.c +++ b/lib/util/time.c @@ -738,8 +738,6 @@ static int tm_diff(struct tm *a, struct tm *b) } -int extra_time_offset=0; - /** return the UTC offset in seconds west of UTC, or 0 if it cannot be determined */ @@ -753,7 +751,7 @@ _PUBLIC_ int get_time_zone(time_t t) tm = localtime(&t); if (!tm) return 0; - return tm_diff(&tm_utc,tm)+60*extra_time_offset; + return tm_diff(&tm_utc,tm); } struct timespec nt_time_to_unix_timespec(NTTIME *nt) diff --git a/lib/util/time.h b/lib/util/time.h index 6a473f6ba14..204c261c1d2 100644 --- a/lib/util/time.h +++ b/lib/util/time.h @@ -300,7 +300,4 @@ struct timespec convert_time_t_to_timespec(time_t t); bool null_timespec(struct timespec ts); -/** Extra minutes to add to the normal GMT to local time conversion. */ -extern int extra_time_offset; - #endif /* _SAMBA_TIME_H_ */ |