From 7faf0a7fcf984d1403b7be79433e9ac20082464b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 11 Jun 2011 13:49:29 +1000 Subject: [PATCH] s3-param Mark 'time offset' as deprecated Andrew Bartlett --- docs-xml/smbdotconf/misc/timeoffset.xml | 4 +++- source3/param/loadparm.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs-xml/smbdotconf/misc/timeoffset.xml b/docs-xml/smbdotconf/misc/timeoffset.xml index 1afc514..2573a5f 100644 --- a/docs-xml/smbdotconf/misc/timeoffset.xml +++ b/docs-xml/smbdotconf/misc/timeoffset.xml @@ -4,10 +4,12 @@ advanced="1" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> - This parameter is a setting in minutes to add + This deprecated 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. + + This option is deprecated, and will be removed in the next major release 0 diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 77b67f1..1ec68ad 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4146,7 +4146,7 @@ static struct parm_struct parm_table[] = { .ptr = &extra_time_offset, .special = NULL, .enum_list = NULL, - .flags = FLAG_ADVANCED, + .flags = FLAG_ADVANCED | FLAG_DEPRECATED, }, { .label = "NIS homedir", -- 1.7.4.4