[Pkg-samba-maint] [samba] 02/06: usershare.patch: Fix "usershare max shares" default in XML doc and in s4

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch master
in repository samba.

commit 792da5418cf7924935e2621a075a3cc5b0ba1351
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Apr 5 00:09:16 2016 +0200

    usershare.patch: Fix "usershare max shares" default in XML doc and in s4
    
    Also fixes samba.tests.docs selftest.
---
 debian/patches/usershare.patch                  | 24 ++++++++++++++++++++++++
 docs-xml/smbdotconf/misc/usersharemaxshares.xml |  2 +-
 lib/param/loadparm.c                            |  2 ++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/patches/usershare.patch b/debian/patches/usershare.patch
index 9199780..c92e891 100644
--- a/debian/patches/usershare.patch
+++ b/debian/patches/usershare.patch
@@ -34,3 +34,27 @@ index c576b22..ef37e7a 100644
  	/* By default disallow sharing of directories not owned by the sharer. */
  	Globals.usershare_owner_only = true;
  	/* By default disallow guest access to usershares. */
+diff --git a/docs-xml/smbdotconf/misc/usersharemaxshares.xml b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
+index 1d2bab7..55b68e4 100644
+--- a/docs-xml/smbdotconf/misc/usersharemaxshares.xml
++++ b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
+@@ -9,5 +9,5 @@
+ 	</para>
+ 
+ </description>
+-<value type="default">0</value>
++<value type="default">100</value>
+ </samba:parameter>
+diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
+index 7b75f13..a59f1fd 100644
+--- a/lib/param/loadparm.c
++++ b/lib/param/loadparm.c
+@@ -2769,6 +2769,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
+ 
+ 	lpcfg_do_global_parameter(lp_ctx, "init logon delay", "100");
+ 
++	lpcfg_do_global_parameter(lp_ctx, "usershare max shares", "100");
++
+ 	lpcfg_do_global_parameter(lp_ctx, "usershare owner only", "yes");
+ 
+ 	lpcfg_do_global_parameter(lp_ctx, "-valid", "yes");
diff --git a/docs-xml/smbdotconf/misc/usersharemaxshares.xml b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
index 0d69bb8..e985857 100644
--- a/docs-xml/smbdotconf/misc/usersharemaxshares.xml
+++ b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
@@ -9,5 +9,5 @@
 	</para>
 
 </description>
-<value type="default">0</value>
+<value type="default">100</value>
 </samba:parameter>
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 73d4204..4f1bd9c 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2878,6 +2878,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 
 	lpcfg_do_global_parameter(lp_ctx, "init logon delay", "100");
 
+	lpcfg_do_global_parameter(lp_ctx, "usershare max shares", "100");
+
 	lpcfg_do_global_parameter(lp_ctx, "usershare owner only", "yes");
 
 	lpcfg_do_global_parameter(lp_ctx, "-valid", "yes");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git