* Merge smb.conf changes from Ubuntu:

  - correct an inconsistency inthe winbind enum comment
  - correct default and example settings to use the canonical names for all
    options, rather than historical synonyms
  - clarify the comment for 'max log size'.
  Thanks to Chuck Short and Richard Laager.

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1765 fc4039ab-9d04-0410-8cac-899223bdd6b0

2 files changed, 25 insertions, 18 deletions

diff --git a/changelog b/changelog
index 70d2ce1039..a181adebfa 100644
--- a/changelog
+++ b/changelog
@@ -12,6 +12,14 @@ samba (3.0.28a-1) UNRELEASED; urgency=low
     - chgpasswd.patch
     - cups.patch
 
+  [ Steve Langasek ]
+  * Merge smb.conf changes from Ubuntu:
+    - correct an inconsistency inthe winbind enum comment
+    - correct default and example settings to use the canonical names for all
+      options, rather than historical synonyms
+    - clarify the comment for 'max log size'.
+    Thanks to Chuck Short and Richard Laager.
+
  -- Christian Perrier <bubulle@debian.org>  Sun, 09 Mar 2008 22:45:01 +0100
 
 samba (3.0.28-4) unstable; urgency=low
diff --git a/smb.conf b/smb.conf
index 22d859099c..09a51c1876 100644
--- a/smb.conf
+++ b/smb.conf
@@ -66,7 +66,7 @@
 # that connects
    log file = /var/log/samba/log.%m
 
-# Put a capping on the size of the log files (in Kb).
+# Cap the size of the individual log files (in KiB).
    max log size = 1000
 
 # If you want Samba to only log through syslog then set the following
@@ -198,13 +198,12 @@
 ;   idmap uid = 10000-20000
 ;   idmap gid = 10000-20000
 ;   template shell = /bin/bash
-;
-; The following was the default behaviour in sarge
-; but samba upstream reverted the default because it might induce
-; performance issues in large organizations
-; See #368251 for some of the consequences of *not* having
-; this setting and smb.conf(5) for all details
-;
+
+# The following was the default behaviour in sarge,
+# but samba upstream reverted the default because it might induce
+# performance issues in large organizations.
+# See Debian bug #368251 for some of the consequences of *not*
+# having this setting and smb.conf(5) for details.
 ;   winbind enum groups = yes
 ;   winbind enum users = yes
 
@@ -220,9 +219,9 @@
    comment = Home Directories
    browseable = no
 
-# By default, the home directories are exported read-only. Change next
-# parameter to 'yes' if you want to be able to write to them.
-   writable = no
+# By default, the home directories are exported read-only. Change the
+# next parameter to 'no' if you want to be able to write to them.
+   read only = yes
 
 # File creation mask is set to 0700 for security reasons. If you want to
 # create files with group=rw permissions, set next parameter to 0775.
@@ -234,7 +233,7 @@
 
 # By default, \\server\username shares can be connected to by anyone
 # with access to the samba server.
-# The following parameter makes sure that only "username" can connect 
+# The following parameter makes sure that only "username" can connect
 # to \\server\username
 # This might need tweaking when using external authentication schemes
    valid users = %S
@@ -245,7 +244,7 @@
 ;   comment = Network Logon Service
 ;   path = /home/samba/netlogon
 ;   guest ok = yes
-;   writable = no
+;   read only = yes
 ;   share modes = no
 
 # Un-comment the following and create the profiles directory to store
@@ -266,9 +265,9 @@
    browseable = no
    path = /var/spool/samba
    printable = yes
-   public = no
-   writable = no
-   create mode = 0700
+   guest ok = no
+   read only = yes
+   create mask = 0700
 
 # Windows clients look for this share name as a source of downloadable
 # printer drivers
@@ -286,10 +285,10 @@
 # A sample share for sharing your CD-ROM with others.
 ;[cdrom]
 ;   comment = Samba server's CD-ROM
-;   writable = no
+;   read only = yes
 ;   locking = no
 ;   path = /cdrom
-;   public = yes
+;   guest ok = yes
 
 # The next two parameters show how to auto-mount a CD-ROM when the
 #	cdrom share is accesed. For this to work /etc/fstab must contain