1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00

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
This commit is contained in:
Andrew Bartlett 2011-06-11 09:49:12 +10:00
parent 35aeeab29d
commit 530e4cac2e
5 changed files with 1 additions and 48 deletions

View File

@ -1,15 +0,0 @@
<samba:parameter name="time offset"
context="G"
type="integer"
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter is a setting in minutes to add
to the normal GMT to local time conversion. This is useful if
you are serving a lot of PCs that have incorrect daylight
saving time handling.</para>
</description>
<value type="default">0</value>
<value type="example">60</value>
</samba:parameter>

View File

@ -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);

View File

@ -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)

View File

@ -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_ */

View File

@ -4137,15 +4137,6 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "time offset",
.type = P_INTEGER,
.p_class = P_GLOBAL,
.ptr = &extra_time_offset,
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "NIS homedir",
.type = P_BOOL,