add a section on encryption and change the formatting a bit

(This used to be commit cdf4aa565302df07b0232c52506ab77be968f80d)

diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index 0d2c6234c70c28cd5b15fee1c35ae08bf4327455..9664ac1ab473e498516645f5a4972a1e2d7b0243 100644 (file)
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -1,124 +1,131 @@
-;; 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 (perhaps too
-;; many!) most of which are not shown in this example
-
-;; Any line which starts with a ; (semi-colon) is a comment and
-;; is ignored
-
-;; Whenever you modify this file you should run the command "testparm"
-;; to check that you have not many any basic syntactic errors. 
-
-;;======================= Global Settings =====================================
+# 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 (perhaps too
+# many!) 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 commentry 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]
 
 [global]
 

-;; workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4

    workgroup = MYGROUP
 
    workgroup = MYGROUP
 

-;; server string is the equivalent of the NT Description field
+# server string is the equivalent of the NT Description field

    server string = Samba Server
 
    server string = Samba Server
 

-;; This option is important for security. It allows you to restrict
-;; connections to machines which are on your local network. The
-;; following example restricts access to two C class networks and
-;; the "loopback" interface. For more examples of the syntax see
-;; the smb.conf man page
+# This option is important for security. It allows you to restrict
+# connections to machines which are on your local network. The
+# following example restricts access to two C class networks and
+# the "loopback" interface. For more examples of the syntax see
+# the smb.conf man page

 ;   hosts allow = 192.168.1. 192.168.2. 127.
 
 ;   hosts allow = 192.168.1. 192.168.2. 127.
 

-;; if you want to automatically load your printer list rather
-;; than setting them up individually then you'll need this
+# if you want to automatically load your printer list rather
+# than setting them up individually then you'll need this

    printcap name = /etc/printcap
    load printers = yes
 
    printcap name = /etc/printcap
    load printers = yes
 

-;; Uncomment this if you want a guest account, you must add this to /etc/passwd
-;; otherwise the user "nobody" is used
+# Uncomment this if you want a guest account, you must add this to /etc/passwd
+# otherwise the user "nobody" is used

 ;  guest account = pcguest
 
 ;  guest account = pcguest
 

-;; this tells Samba to use a separate log file for each machine
-;; that connects
+# this tells Samba to use a separate log file for each machine
+# that connects

    log file = /usr/local/samba/var/log.%m
 
    log file = /usr/local/samba/var/log.%m
 

-;; Put a capping on the size of the log files (in Kb).
+# Put a capping on the size of the log files (in Kb).

    max log size = 50
 
    max log size = 50
 

-;; Security mode. Most people will want user level security. See
-;; security_level.txt for details.
+# Security mode. Most people will want user level security. See
+# security_level.txt for details.

    security = user
    security = user

-;; Use password server option only with security = server
+# Use password server option only with security = server

 ;   password server = <NT-Server-Name>
 
 ;   password server = <NT-Server-Name>
 

-;; 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
+# 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
+;  encrypt passwords = yes
+
+# 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 = /usr/local/samba/lib/smb.conf.%m
 
 ;   include = /usr/local/samba/lib/smb.conf.%m
 

-;; Most people will find that this option gives better performance.
-;; See speed.txt and the manual pages for details
+# Most people will find that this option gives better performance.
+# See speed.txt and the manual pages for details

    socket options = TCP_NODELAY 
 
    socket options = TCP_NODELAY 
 

-;; Configure Samba to use multiple interfaces
-;; If you have multiple network interfaces then you must list them
-;; here. See the man page for details.
+# Configure Samba to use multiple interfaces
+# If you have multiple network interfaces then you must list them
+# here. See the man page for details.

 ;   interfaces = 192.168.12.2/24 192.168.13.2/24 
 
 ;   interfaces = 192.168.12.2/24 192.168.13.2/24 
 

-;; Browser Control Options:
-;; 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
+# Browser Control Options:
+# 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 = no
 
 ;   local master = no
 

-;; OS Level determines the precedence of this server in master browser
-;; elections. The default value should be reasonable
+# OS Level determines the precedence of this server in master browser
+# elections. The default value should be reasonable

 ;   os level = 33
 
 ;   os level = 33
 

-;; 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 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 = yes 
 
 ;   domain master = yes 
 

-;; 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 causes Samba to force a local browser election on startup
+# and gives it a slightly higher chance of winning the election

 ;   preferred master = yes
 
 ;   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.
+# 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>
 
 ;   domain controller = <NT-Domain-Controller-SMBName>
 

-;; Enable this if you want Samba to be a domain logon server for 
-;; Windows95 workstations. 
+# Enable this if you want Samba to be a domain logon server for 
+# Windows95 workstations. 

 ;   domain logons = yes
 
 ;   domain logons = yes
 

-;; if you enable domain logons then you may want a per-machine or
-;; per user logon script
-;; run a specific logon batch file per workstation (machine)
+# if you enable domain logons then you may want a per-machine or
+# per user logon script
+# run a specific logon batch file per workstation (machine)

 ;   logon script = %m.bat
 ;   logon script = %m.bat

-;; run a specific logon batch file per username
+# run a specific logon batch file per username

 ;   logon script = %u.bat
 
 ;   logon script = %u.bat
 

-;; Where to store roving profiles (only for Win95 and WinNT)
-;;        %L substitutes for this servers netbios name, %U is username
-;;        You must uncomment the [Profiles] share below
+# Where to store roving profiles (only for Win95 and WinNT)
+#        %L substitutes for this servers netbios name, %U is username
+#        You must uncomment the [Profiles] share below

 ;   logon path = \\%L\Profiles\%U
 
 ;   logon path = \\%L\Profiles\%U
 

-;; Windows Internet Name Serving Support Section:
-;; WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server

 ;   wins support = yes
 
 ;   wins support = yes
 

-;; 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 - 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
 
 ;   wins server = w.x.y.z
 

-;; WINS Proxy - Tells Samba to answer name resolution queries on
-;; behalf of a non WINS capable client, for this to work there must be
-;; at least one        WINS Server on the network. The default is NO.
+# WINS Proxy - Tells Samba to answer name resolution queries on
+# behalf of a non WINS capable client, for this to work there must be
+# at least one WINS Server on the network. The default is NO.

 ;   wins proxy = yes
 
 ;   wins proxy = yes
 

-;;============================ Share Definitions ==============================
+#============================ Share Definitions ==============================

 [homes]
    comment = Home Directories
    browseable = no
    writable = yes
 
 [homes]
    comment = Home Directories
    browseable = no
    writable = yes
 

-;; Un-comment the following and create the netlogon directory for Domain Logons
+# Un-comment the following and create the netlogon directory for Domain Logons

 ; [netlogon]
 ;   comment = Network Logon Service
 ;   path = /usr/local/samba/lib/netlogon
 ; [netlogon]
 ;   comment = Network Logon Service
 ;   path = /usr/local/samba/lib/netlogon


@@ -126,47 +133,47 @@
 ;   writable = no
 
 
 ;   writable = no
 
 

-;; Un-comment the following to provide a specific roving profile share
-;; the default is to use the user's home directory
+# Un-comment the following to provide a specific roving profile share
+# the default is to use the user's home directory

 ;[Profiles]
 ;    path = /usr/local/samba/profiles
 ;    browseable = no
 ;    guest ok = yes
 
 
 ;[Profiles]
 ;    path = /usr/local/samba/profiles
 ;    browseable = no
 ;    guest ok = yes
 
 

-;; NOTE: If you have a BSD-style print system there is no need to 
-;; specifically define each individual printer
+# NOTE: If you have a BSD-style print system there is no need to 
+# specifically define each individual printer

 [printers]
    comment = All Printers
    path = /usr/spool/samba
    browseable = no
 [printers]
    comment = All Printers
    path = /usr/spool/samba
    browseable = no

-;; Set public = yes to allow user 'guest account' to print
+# Set public = yes to allow user 'guest account' to print

    guest ok = no
    writable = no
    printable = yes
 
    guest ok = no
    writable = no
    printable = yes
 

-;; This one is useful for people to share files
+# This one is useful for people to share files

 ;[tmp]
 ;   comment = Temporary file space
 ;   path = /tmp
 ;   read only = no
 ;   public = yes
 
 ;[tmp]
 ;   comment = Temporary file space
 ;   path = /tmp
 ;   read only = no
 ;   public = yes
 

-;; A publicly accessible directory, but read only, except for people in
-;; the users group
+# A publicly accessible directory, but read only, except for people in
+# the "staff" group

 ;[public]
 ;   comment = Public Stuff
 ;   path = /home/samba
 ;   public = yes
 ;   writable = yes
 ;   printable = no
 ;[public]
 ;   comment = Public Stuff
 ;   path = /home/samba
 ;   public = yes
 ;   writable = yes
 ;   printable = no

-;   write list = @users
+;   write list = @staff

 
 

-;; Other examples. 
-;;
-;; A private printer, usable only by fred. Spool data will be placed in fred's
-;; home directory. Note that fred must have write access to the spool directory,
-;; wherever it is.
+# Other examples. 
+#
+# A private printer, usable only by fred. Spool data will be placed in fred's
+# home directory. Note that fred must have write access to the spool directory,
+# wherever it is.

 ;[fredsprn]
 ;   comment = Fred's Printer
 ;   valid users = fred
 ;[fredsprn]
 ;   comment = Fred's Printer
 ;   valid users = fred


@@ -175,9 +182,9 @@
 ;   public = no
 ;   writable = no
 ;   printable = yes
 ;   public = no
 ;   writable = no
 ;   printable = yes

-;
-;; A private directory, usable only by fred. Note that fred requires write
-;; access to the directory.
+
+# A private directory, usable only by fred. Note that fred requires write
+# access to the directory.

 ;[fredsdir]
 ;   comment = Fred's Service
 ;   path = /usr/somewhere/private
 ;[fredsdir]
 ;   comment = Fred's Service
 ;   path = /usr/somewhere/private


@@ -185,36 +192,34 @@
 ;   public = no
 ;   writable = yes
 ;   printable = no
 ;   public = no
 ;   writable = yes
 ;   printable = no

-;
-;; a service which has a different directory for each machine that connects
-;; this allows you to tailor configurations to incoming machines. You could
-;; also use the %u option to tailor it by user name.
-;; The %m gets replaced with the machine name that is connecting.
+
+# a service which has a different directory for each machine that connects
+# this allows you to tailor configurations to incoming machines. You could
+# also use the %u option to tailor it by user name.
+# The %m gets replaced with the machine name that is connecting.

 ;[pchome]
 ;  comment = PC Directories
 ;  path = /usr/pc/%m
 ;  public = no
 ;  writable = yes
 ;[pchome]
 ;  comment = PC Directories
 ;  path = /usr/pc/%m
 ;  public = no
 ;  writable = yes

-;
-;
-;; A publicly accessible directory, read/write to all users. Note that all files
-;; created in the directory by users will be owned by the default user, so
-;; any user with access can delete any other user's files. Obviously this
-;; directory must be writable by the default user. Another user could of course
-;; be specified, in which case all files would be owned by that user instead.
+
+# A publicly accessible directory, read/write to all users. Note that all files
+# created in the directory by users will be owned by the default user, so
+# any user with access can delete any other user's files. Obviously this
+# directory must be writable by the default user. Another user could of course
+# be specified, in which case all files would be owned by that user instead.

 ;[public]
 ;   path = /usr/somewhere/else/public
 ;   public = yes
 ;   only guest = yes
 ;   writable = yes
 ;   printable = no
 ;[public]
 ;   path = /usr/somewhere/else/public
 ;   public = yes
 ;   only guest = yes
 ;   writable = yes
 ;   printable = no

-;
-;
-;; The following two entries demonstrate how to share a directory so that two
-;; users can place files there that will be owned by the specific users. In this
-;; setup, the directory should be writable by both users and should have the
-;; sticky bit set on it to prevent abuse. Obviously this could be extended to
-;; as many users as required.
+
+# The following two entries demonstrate how to share a directory so that two
+# users can place files there that will be owned by the specific users. In this
+# setup, the directory should be writable by both users and should have the
+# sticky bit set on it to prevent abuse. Obviously this could be extended to
+# as many users as required.

 ;[myshare]
 ;   comment = Mary's and Fred's stuff
 ;   path = /usr/somewhere/shared
 ;[myshare]
 ;   comment = Mary's and Fred's stuff
 ;   path = /usr/somewhere/shared