[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  d0bb41a s3-param Mark 'time offset' as deprecated
      from  88ed4b9 s3:net conf addshare: do not stat-check the share path.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit d0bb41a66008e12baa0a6c5800f0db5ff9134fc4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 11 13:49:29 2011 +1000

    s3-param Mark 'time offset' as deprecated
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/misc/timeoffset.xml |    4 +++-
 source3/param/loadparm.c                |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/misc/timeoffset.xml b/docs-xml/smbdotconf/misc/timeoffset.xml
index 1afc514..e466267 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">
 <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 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",


-- 
Samba Shared Repository