[Pkg-samba-maint] r1990 - branches/samba/experimental/debian

[bubulle at alioth.debian.org]

tags 462046 pending
thanks

Author: bubulle
Date: 2008-07-06 07:19:23 +0000 (Sun, 06 Jul 2008)
New Revision: 1990

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/smb.conf
Log:
Merge r1816

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2008-07-06 07:15:29 UTC (rev 1989)
+++ branches/samba/experimental/debian/changelog	2008-07-06 07:19:23 UTC (rev 1990)
@@ -4,11 +4,18 @@
   * New samba-tools package to provide all "torture" tools:
     smbtorture msgtest masktest locktest locktest2 nsstest vfstest
     pdbtest talloctort replacetort tdbtorture smbconftort
+  * Merged from unstable:
+  * Drop "invalid users = root" from the default smb.conf file
+    as it differs from upstream's behaviour and upstream is fairly
+    noisy about this choice of ours. Closes: #462046
+  * Drop commented "guest account = nobody". This is already upstream's
+    default
 
   [ Steve Langasek ]
   * New upstream release
 
   [ Peter Eisentraut ]
+  * Merged from unstable:
   * Removed myself from Uploaders
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 15 Jun 2008 08:17:58 +0200

Modified: branches/samba/experimental/debian/smb.conf
===================================================================
--- branches/samba/experimental/debian/smb.conf	2008-07-06 07:15:29 UTC (rev 1989)
+++ branches/samba/experimental/debian/smb.conf	2008-07-06 07:19:23 UTC (rev 1990)
@@ -100,9 +100,6 @@
 
    obey pam restrictions = yes
 
-;   guest account = nobody
-   invalid users = root
-
 # This boolean parameter controls whether Samba attempts to sync the Unix
 # password with the SMB password when the encrypted SMB password in the
 # passdb is changed.