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

[bubulle at alioth.debian.org]

tags 476104 pending
thanks

Author: bubulle
Date: 2008-07-06 07:40:06 +0000 (Sun, 06 Jul 2008)
New Revision: 2004

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

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2008-07-06 07:38:45 UTC (rev 2003)
+++ branches/samba/experimental/debian/changelog	2008-07-06 07:40:06 UTC (rev 2004)
@@ -29,6 +29,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
 
   [ Steve Langasek ]
   * New upstream release

Modified: branches/samba/experimental/debian/smb.conf
===================================================================
--- branches/samba/experimental/debian/smb.conf	2008-07-06 07:38:45 UTC (rev 2003)
+++ branches/samba/experimental/debian/smb.conf	2008-07-06 07:40:06 UTC (rev 2004)
@@ -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.