Update samba to 2.2.0. Changes from version 2.0.9 include:

* Integration between Windows oplocks and NFS file opens (IRIX and Linux
  2.4 kernel only). This gives complete data and locking integrity between
  Windows and UNIX file access to the same data files.

* Ability to act as an authentication source for Windows 2000 clients as
  well as for NT4.x clients.

* Integration with the winbind daemon that provides a single
  sign on facility for UNIX servers in Windows 2000/NT4 networks
  driven by a Windows 2000/NT4 PDC.

* Support for native Windows 2000/NT4 printing RPCs. This includes
  support for automatic printer driver download.

* Support for server supported Access Control Lists (ACLs).

* On PAM (Pluggable Authentication Module) based systems - better debugging
  messages and encrypted password users now have access control verified via
  PAM - Note: Authentication still uses the encrypted password database.

* Rewritten internal locking semantics for more robustness.
  This release supports full 64 bit locking semantics on all
  (even 32 bit) platforms. SMB locks are mapped onto POSIX
  locks (32 bit or 64 bit) as the underlying system allows.

* Conversion of various internal flat data structures to use
  database records for increased performance and
  flexibility.

* Support for acting as a MS-DFS (Distributed File System) server.

* Support for manipulating Samba shares using Windows client tools
  (server manager). Per share security can be set using these tools
  and Samba will obey the access restrictions applied.

* Samba profiling support

* Compile time option for enabling a (Virtual file system) VFS layer
  to allow non-disk resources to be exported as Windows filesystems
  (such as databases etc.).

1 files changed, 15 insertions, 9 deletions

diff --git a/net/samba/files/smb.conf.sample b/net/samba/files/smb.conf.sample
index 1db2ca4f5cd..1704527445f 100644
--- a/net/samba/files/smb.conf.sample
+++ b/net/samba/files/smb.conf.sample
@@ -1,4 +1,4 @@
-# $NetBSD: smb.conf.sample,v 1.6 2000/05/02 15:24:09 jlam Exp $
+# $NetBSD: smb.conf.sample,v 1.7 2001/05/14 18:56:16 jlam Exp $
 #
 # This is the main Samba configuration file. You should read the
 # smb.conf(5) manual page in order to understand the options listed
@@ -52,7 +52,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = @LOGDIR@/log.%m
+   log file = @SAMBA_LOGDIR@/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
@@ -60,9 +60,17 @@
 # Security mode. Most people will want user level security. See
 # security_level.txt for details.
    security = user
+
 # Use password server option only with security = server
+# The argument list may include:
+#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+#   password server = *
 ;   password server = <NT-Server-Name>
 
+# Note: Do NOT use the now deprecated option of "domain controller"
+# This option is no longer implemented.
+
 # You may wish to use password encryption. Please read
 # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
 # Do not enable this option unless you have read those documents
@@ -71,10 +79,12 @@
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
 # of the machine that is connecting
-;   include = @ETCDIR@/smb.conf.%m
+;   include = @SAMBA_ETCDIR@/smb.conf.%m
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
+# You may want to add the following on a Linux system:
+#         SO_RCVBUF=8192 SO_SNDBUF=8192
    socket options = TCP_NODELAY 
 
 # Configure Samba to use multiple interfaces
@@ -100,10 +110,6 @@
 # and gives it a slightly higher chance of winning the election
 ;   preferred master = yes
 
-# Use only if you have an NT server on your network that has been
-# configured at install time to be a primary domain controller.
-;   domain controller = <NT-Domain-Controller-SMBName>
-
 # Enable this if you want Samba to be a domain logon server for 
 # Windows95 workstations. 
 ;   domain logons = yes
@@ -147,7 +153,7 @@
 # Un-comment the following and create the netlogon directory for Domain Logons
 ; [netlogon]
 ;   comment = Network Logon Service
-;   path = @PREFIX@/lib/netlogon
+;   path = @SAMBA_ETCDIR@/netlogon
 ;   guest ok = yes
 ;   writable = no
 ;   share modes = no
@@ -156,7 +162,7 @@
 # Un-comment the following to provide a specific roving profile share
 # the default is to use the user's home directory
 ;[Profiles]
-;    path = @PREFIX@/samba/profiles
+;    path = @SAMBA_ETCDIR@/profiles
 ;    browseable = no
 ;    guest ok = yes