s3-param Mark 'time offset' as deprecated

Andrew Bartlett

diff --git a/docs-xml/smbdotconf/misc/timeoffset.xml b/docs-xml/smbdotconf/misc/timeoffset.xml
index 1afc514e60d01af6114bcaf316b3b62ebe351a49..e466267b11dae00638833d76ae63ad5e4299cce0 100644 (file)
--- 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">
 <description>
-       <para>This parameter is a setting in minutes to add 
+       <para>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.</para>
+
+       <note><para>This option is deprecated, and will be removed in the next major release</para></note>
 </description>
 
 <value type="default">0</value>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 77b67f1da5e6afe27a620eec2cb524732eca913b..1ec68add75cb6e7334ebd958a98ad88238d39ed4 100644 (file)
--- 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",