[Pkg-samba-maint] r4093 - trunk/samba/debian

[bubulle at alioth.debian.org]

tags 672497 pending
thanks

Author: bubulle
Date: 2012-05-12 12:30:42 +0000 (Sat, 12 May 2012)
New Revision: 4093

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/smb.conf
Log:
* Merged from Ubuntu:
  - Set 'usershare allow guests', so that usershare admins are 
    allowed to create public shares in addition to authenticated
    ones.
  - add map to guest = Bad user, maps bad username to guest access.
  This allows for anonymous user shares. Closes: #672497  

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-05-11 17:55:40 UTC (rev 4092)
+++ trunk/samba/debian/changelog	2012-05-12 12:30:42 UTC (rev 4093)
@@ -1,4 +1,4 @@
-samba (2:3.6.5-2) unstable; urgency=low
+samba (2:3.6.5-2) UNRELEASED; urgency=low
 
   * The yearly "SambaXP bug cleaning party" release. 11 years
     SambaXP, 20 years Samba and counting...
@@ -53,6 +53,12 @@
     including those with external user backends. It also makes much
     less sense nowadays and the use of libpam-smbpass can easily
     fill most of the needs. Closes: #671926
+  * Merged from Ubuntu:
+    - Set 'usershare allow guests', so that usershare admins are 
+      allowed to create public shares in addition to authenticated
+      ones.
+    - add map to guest = Bad user, maps bad username to guest access.
+    This allows for anonymous user shares. Closes: #672497  
 
  -- Christian Perrier <bubulle at debian.org>  Fri, 11 May 2012 11:32:54 +0200
 

Modified: trunk/samba/debian/smb.conf
===================================================================
--- trunk/samba/debian/smb.conf	2012-05-11 17:55:40 UTC (rev 4092)
+++ trunk/samba/debian/smb.conf	2012-05-12 12:30:42 UTC (rev 4093)
@@ -127,6 +127,10 @@
 # 'passwd program'. The default is 'no'.
    pam password change = yes
 
+# This option controls how unsuccessful authentication attempts are mapped
+# to anonymous connections
+   map to guest = bad user
+
 ########## Domains ###########
 
 # Is this machine able to authenticate users. Both PDC and BDC
@@ -231,6 +235,10 @@
 # Maximum number of usershare. 0 (default) means that usershare is disabled.
 ;   usershare max shares = 100
 
+# Allow users who've been granted usershare privileges to create
+# public shares, not just authenticated ones
+   usershare allow guests = yes
+
 #======================= Share Definitions =======================
 
 [homes]