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

[bubulle at alioth.debian.org]

tags 476104 pending
thanks

Author: bubulle
Date: 2008-05-08 12:02:05 +0000 (Thu, 08 May 2008)
New Revision: 1849

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/smb.conf
Log:
Remove "socket options" which is the default value anyway


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-04-29 14:06:05 UTC (rev 1848)
+++ trunk/samba/debian/changelog	2008-05-08 12:02:05 UTC (rev 1849)
@@ -25,6 +25,8 @@
   * Update copyright and README.debian information for current and past
     maintainers. Remove redundant mention of Tridge (the copyright is enough)
   * Add doc-base files for samba-doc-pdf. Closes: #451685
+  * Remove "socket options" from smb.conf (the value that was set
+    is the default value). 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-29 14:06:05 UTC (rev 1848)
+++ trunk/samba/debian/smb.conf	2008-05-08 12:02:05 UTC (rev 1849)
@@ -182,13 +182,6 @@
 # of the machine that is connecting
 ;   include = /home/samba/etc/smb.conf.%m
 
-# Most people will find that this option gives better performance.
-# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/speed.html
-# for details
-# You may want to add the following on a Linux system:
-#         SO_RCVBUF=8192 SO_SNDBUF=8192
-#   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
 # working to ease installation and configuration of linpopup and samba.