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

Thu Apr 17 06:55:30 UTC 2008

tags 476104 pending
thanks

Author: bubulle
Date: 2008-04-17 06:55:30 +0000 (Thu, 17 Apr 2008)
New Revision: 1821

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/smb.conf
Log:
"New" policy for commented settings in smb.conf:
- Use # for settings we propose with a default value
- Use ; for settings we propose with a default value
- Don't explicitely (i.e. uncomment) add settings when they have the default value


Modified: trunk/samba/debian/changelog
===================================================================

--- trunk/samba/debian/changelog	2008-04-16 22:08:13 UTC (rev 1820)
+++ trunk/samba/debian/changelog	2008-04-17 06:55:30 UTC (rev 1821)
@@ -10,6 +10,11 @@
   * Remove Conflicts with non-existing packages
   * Drop dpkg-dev and binutils from Build-Depends, since the versioned
     build-dep is no longer needed and these are both Build-Essential
+  * Mini-policy for settings in smb.conf:
+    - don't explicitely set settings to their default value
+    - commented settings with the default value are commented with "#"
+    - commented settings with a non-default value are commented with ";"
+  * Apply this policy to "socket options". Closes: #476104
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 16 Apr 2008 23:14:46 +0200
 

Modified: trunk/samba/debian/smb.conf
===================================================================
--- trunk/samba/debian/smb.conf	2008-04-16 22:08:13 UTC (rev 1820)
+++ trunk/samba/debian/smb.conf	2008-04-17 06:55:30 UTC (rev 1821)
@@ -7,14 +7,22 @@
 # here. Samba has a huge number of configurable options most of which 
 # are not shown in this example
 #
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentary and a ; for parts of the config file that you
-# may wish to enable
+# Some options that are considered worth to be considered for tuning
+# have been added, but commented, in this file.
+#  - When such options are commented with ";", the proposed setting
+#    differs from the default Samba behaviour
+#  - When commented with "#", the proposed setting is the default
+#    behaviour of Samba but the option is considered important
+#    enough to be mentioned here
 #
 # NOTE: Whenever you modify this file you should run the command
 # "testparm" to check that you have not made any basic syntactic 
 # errors. 
+# A well established practice is to name the original file
+# "smb.conf.master" and create the "real" master file with
+# testparm -s smb.conf.master >smb.conf
+# This minimizes the size of the really used smb.conf file
+# which, according to the Samba Team, has performance impacts
 #
 
 #======================= Global Settings =======================
@@ -31,7 +39,7 @@
 
 # Windows Internet Name Serving Support Section:
 # WINS Support - Tells the NMBD component of Samba to enable its WINS Server
-;   wins support = no
+#   wins support = no
 
 # WINS Server - Tells the NMBD components of Samba to be a WINS Client
 # Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
@@ -42,7 +50,7 @@
 
 # What naming service and in what order should we use to resolve host names
 # to IP addresses
-;   name resolve order = lmhosts host wins bcast
+#   name resolve order = lmhosts host wins bcast
 
 #### Networking ####
 
@@ -56,7 +64,7 @@
 # It is recommended that you enable this feature if your Samba machine is
 # not protected by a firewall or is a firewall itself.  However, this
 # option cannot handle dynamic or non-broadcast interfaces correctly.
-;   bind interfaces only = true
+;   bind interfaces only = yes
 
 
 
@@ -71,7 +79,7 @@
 
 # If you want Samba to only log through syslog then set the following
 # parameter to 'yes'.
-;   syslog only = no
+#   syslog only = no
 
 # We want Samba to log a minimum amount of information to syslog. Everything
 # should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
@@ -88,7 +96,7 @@
 # in this server for every user accessing the server. See
 # /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/ServerType.html
 # in the samba-doc package for details.
-;   security = user
+#   security = user
 
 # You may wish to use password encryption.  See the section on
 # 'encrypt passwords' in the smb.conf(5) manpage before enabling.
@@ -131,13 +139,14 @@
 # samba server (see below)
 ;   logon path = \\%N\profiles\%U
 # Another common choice is storing the profile in the user's home directory
-;   logon path = \\%N\%U\profile
+# (this is Samba's default)
+#   logon path = \\%N\%U\profile
 
 # The following setting only takes effect if 'domain logons' is set
 # It specifies the location of a user's home directory (from the client
 # point of view)
 ;   logon drive = H:
-;   logon home = \\%N\%U
+#   logon home = \\%N\%U
 
 # The following setting only takes effect if 'domain logons' is set
 # It specifies the script to run during logon. The script must be stored
@@ -154,7 +163,7 @@
 
 # If you want to automatically load your printer list rather
 # than setting them up individually then you'll need this
-;   load printers = yes
+#   load printers = yes
 
 # lpr(ng) printing. You may wish to override the location of the
 # printcap file
@@ -178,7 +187,7 @@
 # for details
 # You may want to add the following on a Linux system:
 #         SO_RCVBUF=8192 SO_SNDBUF=8192
-   socket options = TCP_NODELAY
+#   socket options = TCP_NODELAY
 
 # The following parameter is useful only if you have the linpopup package
 # installed. The samba maintainer and the linpopup maintainer are
@@ -188,7 +197,7 @@
 # Domain Master specifies Samba to be the Domain Master Browser. If this
 # machine will be configured as a BDC (a secondary logon server), you
 # must set this to 'no'; otherwise, the default behavior is recommended.
-;   domain master = auto
+#   domain master = auto
 
 # Some defaults for winbind (make sure you're not using the ranges
 # for something else.)


