trying to get HEAD building again. If you want the code

prior to this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE
(This used to be commit adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

1 files changed, 94 insertions, 80 deletions

diff --git a/packaging/Debian/debian/smb.conf b/packaging/Debian/debian/smb.conf
index f5d04889d1..8a75979945 100644
--- a/packaging/Debian/debian/smb.conf
+++ b/packaging/Debian/debian/smb.conf
@@ -1,7 +1,6 @@
 #
 # Sample configuration file for the Samba suite for Debian GNU/Linux.
 #
-# $Id: smb.conf,v 1.3 2003/06/01 07:12:51 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
@@ -22,27 +21,31 @@
 
 [global]
 
-# Change this for the workgroup/NT-domain name your Samba server will part of
+## Browsing/Identification ###
+
+# Change this to 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
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable its WINS Server
+;   wins support = no
 
-# lpr(ng) printing. You may wish to override the location of the
-# printcap file
-;   printing = bsd
-;   printcap name = /etc/printcap
+# 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
 
-# cups printing.  See also the cupsaddsmb(8) manpage
-;   printing = cups
-;   printcap name = cups
+# This will prevent nmbd to search for NetBIOS names through DNS.
+   dns proxy = no
 
-;   guest account = nobody
-   invalid users = root
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+;   name resolve order = lmhosts host wins bcast
+
+
+#### Debugging/Accounting ####
 
 # This tells Samba to use a separate log file for each machine
 # that connects
@@ -51,118 +54,116 @@
 # Put a capping on the size of the log files (in Kb).
    max log size = 1000
 
-# 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.
+# If you want Samba to only log through syslog then set the following
+# parameter to 'yes'.
 ;   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
+# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
 # through syslog you should set the following parameter to something higher.
    syslog = 0
 
+# Do something sensible when Samba crashes: mail the admin a backtrace
+   panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
 # "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.
+# /usr/share/doc/samba-doc/htmldocs/ServerType.html in the samba-doc
+# package 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
+# You may wish to use password encryption.  See the section on
+# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
    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
+   obey pam restrictions = yes
 
-# 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
+;   guest account = nobody
+   invalid users = root
 
-# --- Browser Control Options ---
+# This boolean parameter controls whether Samba attempts to sync the Unix
+# password with the SMB password when the encrypted SMB password in the
+# passdb is changed.
+;   unix password sync = no
 
-# 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!
+# 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 .
 
-# 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
+# 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
 
-# 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
+########## Printing ##########
 
-# 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
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+;   load printers = yes
 
-# --- End of Browser Control Options ---
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+;   printing = bsd
+;   printcap name = /etc/printcap
 
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = no
+# CUPS printing.  See also the cupsaddsmb(8) manpage in the
+# cupsys-client package.
+;   printing = cups
+;   printcap name = cups
 
-# 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
+# When using [print$], root is implicitly a 'printer admin', but you can
+# also give this right to other users to add drivers and set printer
+# properties
+;   printer admin = @ntadmin
 
-# This will prevent nmbd to search for NetBIOS names through DNS.
-   dns proxy = 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
+######## File sharing ########
 
 # 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
 
-# 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 .
+############ Misc ############
 
-# 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
+# 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 smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/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.
 ;   message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
 
-   obey pam restrictions = yes
+# 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
 
 # Some defaults for winbind (make sure you're not using the ranges
 # for something else.)
-;   winbind uid = 10000-20000
-;   winbind gid = 10000-20000
+;   idmap uid = 10000-20000
+;   idmap 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]
@@ -199,6 +200,19 @@
    writable = no
    create mode = 0700
 
+# Windows clients look for this share name as a source of downloadable
+# printer drivers
+[print$]
+   comment = Printer Drivers
+   path = /var/lib/samba/printers
+   browseable = yes
+   read only = yes
+   guest ok = no
+# Uncomment to allow remote administration of Windows print drivers.
+# Replace 'ntadmin' with the name of the group your admin users are
+# members of.
+;   write list = root, @ntadmin
+
 # A sample share for sharing your CD-ROM with others.
 ;[cdrom]
 ;   comment = Samba server's CD-ROM