[Pkg-samba-maint] r3737 - in branches/samba/experimental/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2011-04-15 17:03:38 +0000 (Fri, 15 Apr 2011)
New Revision: 3737

Added:
   branches/samba/experimental/debian/patches/usershare.patch
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/patches/series
Log:
Re-add usershare.patch: it is still needed

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2011-04-15 17:00:11 UTC (rev 3736)
+++ branches/samba/experimental/debian/changelog	2011-04-15 17:03:38 UTC (rev 3737)
@@ -1,8 +1,6 @@
 samba (2:3.6.0~pre2-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * usershare.patch no longer needed as user shares are now enabled by
-    default
 
  -- Christian Perrier <bubulle at debian.org>  Fri, 15 Apr 2011 14:12:54 +0200
 

Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2011-04-15 17:00:11 UTC (rev 3736)
+++ branches/samba/experimental/debian/patches/series	2011-04-15 17:03:38 UTC (rev 3737)
@@ -6,6 +6,7 @@
 smbclient-pager.patch
 undefined-symbols.patch
 VERSION.patch
+usershare.patch
 smbtar-bashism.patch
 no-unnecessary-cups.patch
 autoconf.patch

Added: branches/samba/experimental/debian/patches/usershare.patch
===================================================================
--- branches/samba/experimental/debian/patches/usershare.patch	                        (rev 0)
+++ branches/samba/experimental/debian/patches/usershare.patch	2011-04-15 17:03:38 UTC (rev 3737)
@@ -0,0 +1,38 @@
+Description: Enable net usershares by default at build time
+ Enable net usershares by default at build time, with a limit of
+ 100, and update the corresponding documentation.
+Author: Mathias Gug <mathiaz at ubuntu.com>,
+Author: Steve Langasek <vorlon at debian.org>
+Bug-Debian: http://bugs.debian.org/443230
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
+Forwarded: not-needed
+
+Index: experimental/docs/manpages/net.8
+===================================================================
+--- experimental.orig/docs/manpages/net.8
++++ experimental/docs/manpages/net.8
+@@ -916,9 +916,9 @@
+ Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\&. In this case the secret is used as the password for the user DN used to bind to the ldap server\&.
+ .SS "USERSHARE"
+ .PP
+-Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user defined shares to be exported using the "net usershare" commands\&.
++Starting with version 3\&.0\&.23, a Samba server now supports the ability for non\-root users to add user-defined shares to be exported using the "net usershare" commands\&.
+ .PP
+-To set this up, first set up your smb\&.conf by adding to the [global] section: usershare path = /usr/local/samba/lib/usershares Next create the directory /usr/local/samba/lib/usershares, change the owner to root and set the group owner to the UNIX group who should have the ability to create usershares, for example a group called "serverops"\&. Set the permissions on /usr/local/samba/lib/usershares to 01770\&. (Owner and group all access, no access for others, plus the sticky bit, which means that a file in that directory can be renamed or deleted only by the owner of the file)\&. Finally, tell smbd how many usershares you will allow by adding to the [global] section of smb\&.conf a line such as : usershare max shares = 100\&. To allow 100 usershare definitions\&. Now, members of the UNIX group "serverops" can create user defined shares on demand using the commands below\&.
++Members of the UNIX group "sambashare" can create user-defined shares on demand using the commands below\&.
+ .PP
+ The usershare commands are:
+ .RS 4
+Index: experimental/source3/param/loadparm.c
+===================================================================
+--- experimental.orig/source3/param/loadparm.c
++++ experimental/source3/param/loadparm.c
+@@ -5189,7 +5189,7 @@
+ 	string_set(&Globals.szUsersharePath, s);
+ 	SAFE_FREE(s);
+ 	string_set(&Globals.szUsershareTemplateShare, "");
+-	Globals.iUsershareMaxShares = 0;
++	Globals.iUsershareMaxShares = 100;
+ 	/* By default disallow sharing of directories not owned by the sharer. */
+ 	Globals.bUsershareOwnerOnly = True;
+ 	/* By default disallow guest access to usershares. */