JHT ==> Just tidying up for Release.

(This used to be commit 4e9b7c92f79e1b7bf68103fe378449178b86e315)

1 files changed, 69 insertions, 32 deletions

diff --git a/examples/redhat/smb.conf b/examples/redhat/smb.conf
index d615580710..37c2035363 100644
--- a/examples/redhat/smb.conf
+++ b/examples/redhat/smb.conf
@@ -1,7 +1,5 @@
-; The global setting for a RedHat default install
-; smbd re-reads this file regularly, but if in doubt stop and restart it:
-; /etc/rc.d/init.d/smb stop
-; /etc/rc.d/init.d/smb start
+; The global setting for a default install
+; Copyright(C) John H Terpstra & Jeremy Allison - 1997
 ;======================= Global Settings =====================================
 [global]
 
@@ -9,19 +7,17 @@
    workgroup = WORKGROUP
 
 ; comment is the equivalent of the NT Description field
-   comment = RedHat Samba Server
-
-; volume = used to emulate a CDRom label (can be set on a per share basis)
-   volume = RedHat4
+   comment = Samba Server
 
 ; printing = BSD or SYSV or AIX, etc.
    printing = bsd
    printcap name = /etc/printcap
    load printers = yes
 
-; Uncomment this if you want a guest account
+; Uncomment this if you want a guest account, you must add this to /etc/passwd
 ;  guest account = pcguest
-   log file = /var/log/samba-log.%m
+   log file = /var/log/samba/log.%m
+
 ; Put a capping on the size of the log files (in Kb)
    max log size = 50
 
@@ -34,16 +30,21 @@
 ; Security and file integrity related options
    lock directory = /var/lock/samba
    locking = yes
-   strict locking = yes
+; Strict locking is available for paranoid locking situations only
+;        enabling this severely degrades read / write performance.
+;   strict locking = yes
 ;   fake oplocks = yes
    share modes = yes
+
 ; Security modes: USER uses Unix username/passwd, SHARE uses WfW type passwords
-;        SERVER uses a Windows NT Server to provide authentication services
+;        SERVER uses an other SMB server (eg: Windows NT Server or Samba)
+;        to provide authentication services
    security = user
 ; Use password server option only with security = server
 ;   password server = <NT-Server-Name>
 
-; Configuration Options ***** Watch location in smb.conf for side-effects *****
+; Configuration Options ***** The location of this entry in your smb.conf
+; heirachy determines  which parameters are overwritten - please watch out!
 ; Where %m is any SMBName (machine name, or computer name) for which a custom
 ; configuration is desired
 ;   include = /etc/smb.conf.%m
@@ -56,54 +57,91 @@
 ;   socket address = aaa.bbb.ccc.ddd
 ; Use keep alive only if really needed!!!!
 ;   keep alive = 60
-
-; Domain Control Options
-; OS Level gives Samba the power to rule the roost. Windows NT = 32
+; Configure Samba to use multiple interfaces
+;        Samba will auto-detect network interfaces - only use this if
+;        the auto-detection does not deliver the needed results
+;   interfaces = 192.168.12.2/24 176.16.111.22/19 10.11.13.14/255.255.252.0
+
+; Browser Control Options:
+; Local Master set to True causes Samba to participate in browser elections
+;       the default setting is true, this causes Samba to behave like a
+;       Windows NT server. Setting this to false turns off all browser
+;       election participation.
+;   local master = yes
+
+; OS Level gives Samba the power to win browser elections. Windows NT = 32
 ;	Any value < 32 means NT wins as Master Browser, > 32 Samba gets it
+;	default = 0, this ensures that Samba will NOT win the browser election.
 ;   os level = 33
-; specifies Samba to be the Domain Master Browser
+
+; Domain Master specifies Samba to be the Domain Master Browser
+;	Only ever set this if there is NO Windows NT Domain Controller on the
+;	network
 ;   domain master = yes 
+
+; Preferred Master causes Samba to force a local browser election on startup
+;   preferred master = yes
+
 ; Use with care 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 Logon Service Options:
 ; Domain logon control can be a good thing! See [netlogon] share section below!
+;	Do NOT set this to yes if there is an Windows NT domain controller
+;	on the network
 ;   domain logons = yes
+
 ; run a specific logon batch file per workstation (machine)
 ;   logon script = %m.bat
 ; run a specific logon batch file per username
 ;   logon script = %u.bat
-; Windows Internet Name Serving Support Section
+
+; Where to store roving profiles (only for Win95 and WinNT)
+;        %L substitutes for the SMB name we are called, %U is username
+;        You must uncomment the [Profiles] share below
+;   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
-;	the default is NO.
+;	the default is NO. If you have an Windows NT Server WINS use it!
+;	Samba defaults to wins support = no
 ;   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 = w.x.y.z
+
 ; WINS Proxy - Tells Samba to answer name resolution queries on behalf of a non
 ;	WINS Client capable client, for this to work there must be at least one
 ;	WINS Server on the network. The default is NO.
 ;   wins proxy = yes
 
-;============================ Share Declarations ==============================
+;============================ Share Definitions ==============================
 [homes]
    comment = Home Directories
    browseable = no
-   read only = no
-   preserve case = yes
-   short preserve case = yes
-   create mode = 0750
+   writable = yes
 
 ; Un-comment the following and create the netlogon directory for Domain Logons
 ; [netlogon]
 ;   comment = Samba Network Logon Service
-;   path = /home/netlogon
+;   path = /usr/local/samba/lib/netlogon
 ; Case sensitivity breaks logon script processing!!!
 ;   case sensitive = no
 ;   guest ok = yes
 ;   locking = no
-;   read only = yes
-;   browseable = yes  ; say NO if you want to hide the NETLOGON share
-;   admin users = @wheel
+;   writable = no
+;   For browseable say NO if you want to hide the NETLOGON share
+;   browseable = yes
+
+; 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
+;    printable = no
+;    guest ok = yes
 
 ; NOTE: There is NO need to specifically define each individual printer
 [printers]
@@ -112,9 +150,9 @@
    browseable = no
    printable = yes
 ; Set public = yes to allow user 'guest account' to print
-   public = no
+   guest ok = no
    writable = no
-   create mode = 0700
+   create mask = 0700
 
 ;[tmp]
 ;   comment = Temporary file space
@@ -164,7 +202,7 @@
 ;  comment = PC Directories
 ;  path = /usr/pc/%m
 ;  public = no
-;  writeable = yes
+;  writable = yes
 ;
 ;
 ; A publicly accessible directory, read/write to all users. Note that all files
@@ -193,4 +231,3 @@
 ;   writable = yes
 ;   printable = no
 ;   create mask = 0765
-