Bringing packaging/Debian/ up to date with the current Samba package

in Debian unstable. The stuff here was ages old...
(This used to be commit 5646df8bfb327d74f9c07fc219023a5aecdbc70d)

1 files changed, 177 insertions, 101 deletions

diff --git a/packaging/Debian/debian/smb.conf b/packaging/Debian/debian/smb.conf
index 14cc20f49c..1c9177f5f3 100644
--- a/packaging/Debian/debian/smb.conf
+++ b/packaging/Debian/debian/smb.conf
@@ -1,119 +1,195 @@
-;
-; /etc/samba/smb.conf
-;
-; Sample configuration file for the Samba suite for Debian GNU/Linux
-;
-; Please see the manual page for smb.conf for detailed description of
-;	every parameter.
-;
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+# $Id: smb.conf,v 1.2.4.1 2003/06/01 04:30:10 peloy Exp $
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# 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
+#
+# NOTE: Whenever you modify this file you should run the command
+# "testparm" to check that you have not many any basic syntactic 
+# errors. 
+#
+
+#======================= Global Settings =======================
 
 [global]
-   printing = bsd
-   printcap name = /etc/printcap
-   load printers = yes
-   guest account = nobody
+
+# Change this for the workgroup/NT-domain name your Samba server will part of
+   workgroup = DEBIAN_FANS
+
+# server string is the equivalent of the NT Description field
+   server string = %h server (Samba %v)
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+;   load printers = yes
+
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+;   printing = bsd
+;   printcap name = /etc/printcap
+
+# cups printing.  See also the cupsaddsmb(8) manpage
+;   printing = cups
+;   printcap name = cups
+
+;   guest account = nobody
    invalid users = root
 
-; "security = user" is always a good idea. This will require a Unix account
-;	in this server for every user accessing the server.
-   security = user
+# This tells Samba to use a separate log file for each machine
+# that connects
+   log file = /var/log/samba/log.%m
 
-; Change this for the workgroup your Samba server will part of
-   workgroup = WORKGROUP
+# Put a capping on the size of the log files (in Kb).
+   max log size = 1000
 
-   server string = %h server (Samba %v)
+# If you want Samba to log though syslog only then set the following
+# parameter to 'yes'. Please note that logging through syslog in
+# Samba is still experimental.
+;   syslog only = no
+
+# We want Samba to log a minimum amount of information to syslog. Everything
+# should go to /var/log/samba/log.{smb,nmb} instead. If you want to log
+# through syslog you should set the following parameter to something higher.
+   syslog = 0
+
+# "security = user" is always a good idea. This will require a Unix account
+# in this server for every user accessing the server. See
+# security_level.txt for details.
+;   security = user
+
+# You may wish to use password encryption. Please read ENCRYPTION.html,
+# Win95.txt and WinNT.txt in the Samba documentation. Do not enable this
+# option unless you have read those documents
+   encrypt passwords = no
+
+# If you are using encrypted passwords, Samba will need to know what
+# password database type you are using.  
+   passdb backend = tdbsam guest
+
+# 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 = /home/samba/etc/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
+
+# --- Browser Control Options ---
+
+# Please _read_ BROWSING.txt and set the next four parameters according
+# to your network setup. The defaults are specified below (commented
+# out.) It's important that you read BROWSING.txt so you don't break
+# browsing in your network!
 
-; If you want Samba to log though syslog only then set the following
-;	parameter to 'yes'. Please note that logging through syslog in
-;	Samba is still experimental.
-   syslog only = no
-
-; We want Samba to log a minimum amount of information to syslog. Everything
-;	should go to /var/log/{smb,nmb} instead. If you want to log through
-;	syslog you should set the following parameter to something higher.
-   syslog = 0;
-
-; This socket options really speed up Samba under Linux, according to my
-;	own tests.
-   socket options = IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=4096 SO_RCVBUF=4096
-
-; Passwords are encrypted by default. This way the latest Windows 95 and NT
-;	clients can connect to the Samba server with no problems.
-   encrypt passwords = yes
-
-; It's always a good idea to use a WINS server. If you want this server
-;	to be the WINS server for your network change the following parameter
-;	to "yes". Otherwise leave it as "no" and specify your WINS server
-; 	below (note: only one Samba server can be the WINS server).
-;	Read BROWSING.txt for more details.
-   wins support = no
-
-; If this server is not the WINS server then specify who is it and uncomment
-;	next line.
-;   wins server = 172.16.0.10
-
-; Please read BROWSING.txt and set the next four parameters according
-;	to your network setup. There is no valid default so they are commented
-;	out.
-;   os level = 0
-;   domain master = no
-;   local master = no
-;   preferred master = no
-
-; What naming service and in what order should we use to resolve host names
-;	to IP addresses
-   name resolve order = lmhosts host wins bcast
-
-; This will prevent nmbd to search for NetBIOS names through DNS.
+# set local master to no if you don't want Samba to become a master
+# browser on your network. Otherwise the normal election rules apply
+;   local master = yes
+
+# OS Level determines the precedence of this server in master browser
+# elections. The default value should be reasonable
+;   os level = 20
+
+# Domain Master specifies Samba to be the Domain Master Browser. This
+# allows Samba to collate browse lists between subnets. Don't use this
+# if you already have a Windows NT domain controller doing this job
+;   domain master = auto
+
+# Preferred Master causes Samba to force a local browser election on startup
+# and gives it a slightly higher chance of winning the election
+;   preferred master = auto
+
+# --- End of Browser Control Options ---
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
+;   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
+;   wins server = w.x.y.z
+
+# This will prevent nmbd to search for NetBIOS names through DNS.
    dns proxy = no
 
-; Name mangling options
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+;   name resolve order = lmhosts host wins bcast
 
-   preserve case = yes
-   short preserve case = yes
+# Name mangling options
+;   preserve case = yes
+;   short preserve case = yes
 
-; This boolean parameter controlls whether Samba attempts to sync. the Unix
-;	password with the SMB password when the encrypted SMB password in the
-;	/etc/samba/smbpasswd file is changed.
-   unix password sync = false
+# This boolean parameter controlls whether Samba attempts to sync. the Unix
+# password with the SMB password when the encrypted SMB password in the
+# /etc/samba/smbpasswd file is changed.
+;   unix password sync = false
 
-; For Unix password sync. to work on a Debian GNU/Linux system, the following
-;	parameters must be set (thanks to Augustin Luton
-;	<aluton@hybrigenics.fr> for sending the correct chat script for
-;	the passwd program in Debian Potato).
+# For Unix password sync. to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Augustin Luton <aluton@hybrigenics.fr> for
+# sending the correct chat script for the passwd program in Debian Potato).
    passwd program = /usr/bin/passwd %u
    passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n .
 
-; 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.
-;   message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
+# This boolean controls whether PAM will be used for password changes
+# when requested by an SMB client instead of the program listed in
+# 'passwd program'. The default is 'no'.
+;   pam password change = no
 
-; The default maximum log file size is 5 MBytes. That's too big so this
-;	next parameter sets it to 1 MByte. Currently, Samba rotates log
-;	files (/var/log/{smb,nmb} in Debian) when these files reach 1000 KBytes.
-;	A better solution would be to have Samba rotate the log file upon
-;	reception of a signal, but for now on, we have to live with this.
-   max log size = 1000
+# 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.
+;   message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
 
    obey pam restrictions = yes
 
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+;   winbind uid = 10000-20000
+;   winbind gid = 10000-20000
+;   template shell = /bin/bash
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+   panic action = /usr/share/samba/panic-action %d
+
+#======================= Share Definitions =======================
+
 [homes]
    comment = Home Directories
    browseable = no
 
-; By default, the home directories are exported read only. Change next
-;	parameter to "no" if you want to be able to write to them.
-   read only = yes
+# 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
 
-; 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.
+# 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.
    create mask = 0700
 
-; Directory creation mask is set to 0700 for security reasons. If you want to
-;	create dirs. with group=rw permissions, set next parameter to 0775.
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
    directory mask = 0700
 
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+;   comment = Network Logon Service
+;   path = /home/samba/netlogon
+;   guest ok = yes
+;   writable = no
+;   share modes = no
+
 [printers]
    comment = All Printers
    browseable = no
@@ -123,25 +199,25 @@
    writable = no
    create mode = 0700
 
-; A sample share for sharing your CD-ROM with others.
+# A sample share for sharing your CD-ROM with others.
 ;[cdrom]
 ;   comment = Samba server's CD-ROM
 ;   writable = no
 ;   locking = no
 ;   path = /cdrom
 ;   public = 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
-;	an entry like this:
-;
-;       /dev/scd0   /cdrom  iso9660 defaults,noauto,ro,user   0 0
-;
-; The CD-ROM gets unmounted automatically after the connection to the
-;
-; If you don't want to use auto-mounting/unmounting make sure the CD
-;	is mounted on /cdrom
-;
+
+# 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
+#	an entry like this:
+#
+#       /dev/scd0   /cdrom  iso9660 defaults,noauto,ro,user   0 0
+#
+# The CD-ROM gets unmounted automatically after the connection to the
+#
+# If you don't want to use auto-mounting/unmounting make sure the CD
+#	is mounted on /cdrom
+#
 ;   preexec = /bin/mount /cdrom
 ;   postexec = /bin/umount /cdrom