diff -u samba-3.0.25b/debian/changelog samba-3.0.25b/debian/changelog
--- samba-3.0.25b/debian/changelog
+++ samba-3.0.25b/debian/changelog
@@ -1,3 +1,10 @@
+samba (3.0.25b-1ubuntu2) gutsy; urgency=low
+
+  * debian/smb.conf:
+    - Fix 'valid users =' option in smb.conf. LP: #131419.
+
+ -- Mathias Gug <mathiaz@ubuntu.com>  Thu, 09 Aug 2007 21:39:54 -0400
+
 samba (3.0.25b-1ubuntu1) gutsy; urgency=low
 
   * Dropped patches:
diff -u samba-3.0.25b/debian/smb.conf samba-3.0.25b/debian/smb.conf
--- samba-3.0.25b/debian/smb.conf
+++ samba-3.0.25b/debian/smb.conf
@@ -226,6 +226,7 @@
 # By default, \\server\username shares can be connected to by anyone
 # with access to the samba server.  Un-comment the following parameter
 # to make sure that only "username" can connect to \\server\username
+# This might need tweaking when using external authentication schemes
 ;   valid users = %S
 
 # By default, the home directories are exported read-only. Change next
@@ -240,11 +241,6 @@
 # create dirs. with group=rw permissions, set next parameter to 0775.
 ;   directory mask = 0700
 
-# Restrict access to home directories 
-# to the one of the authenticated user
-# This might need tweaking when using external authentication schemes
-   valid users = %S
-
 # Un-comment the following and create the netlogon directory for Domain Logons
 # (you need to configure Samba to act as a domain controller too.)
 ;[netlogon]