JHT ==> Just tidying up for Release.

5 files changed, 224 insertions, 132 deletions

diff --git a/examples/README b/examples/README
index 2dbc630e48c..c2c36bdcdf1 100644
--- a/examples/README
+++ b/examples/README
@@ -1,6 +1,11 @@
+Copyright(C) Samba-Team 1993-1997
+
 This directory contains example config files and related material for
 Samba. 
 
+At a minimum please refer to the smb.conf.default file for current
+information regarding global and share parameter settings.
+
 Send additions to: samba-bugs@samba.anu.edu.au
 
 
diff --git a/examples/redhat/samba-make.patch b/examples/redhat/samba-make.patch
index cf9641949d0..f1c6a733e9e 100644
--- a/examples/redhat/samba-make.patch
+++ b/examples/redhat/samba-make.patch
@@ -1,81 +1,132 @@
---- samba-1.9.17/source/Makefile.orig	Fri Jul  4 07:22:06 1997
-+++ samba-1.9.17/source/Makefile	Fri Jul  4 07:27:17 1997
-@@ -5,16 +5,16 @@
- 
- # The base manpages directory to put the man pages in
- # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
--MANDIR = /usr/local/man
-+MANDIR = /usr/man
- 
- # The directories to put things in. If you use multiple
- # architectures or share the samba binaries across NFS then
- # you will probably want to change this layout.
--BASEDIR = /usr/local/samba
--BINDIR = /usr/local/bin
--SBINDIR = $(BASEDIR)/bin
--LIBDIR = $(BASEDIR)/lib
--VARDIR = $(BASEDIR)/var
-+BASEDIR = /usr
-+BINDIR = $(BASEDIR)/bin
-+SBINDIR = $(BASEDIR)/sbin
-+LIBDIR = /etc
-+VARDIR = /var
- 
- # The permissions to give the executables
- INSTALLPERMS = 0755
-@@ -23,13 +23,13 @@
- # add -DSYSLOG for syslog support
- # RPM_OPT_FLAGS is needed when building an RPM distribution package
- # for RedHat Linux.
--# FLAGS1 = $(RPM_OPT_FLAGS)
--FLAGS1 = -O
-+FLAGS1 = $(RPM_OPT_FLAGS)
-+# FLAGS1 = -O
- LIBS1 = 
- 
- # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
- # use cc, instead you will have to use gcc. 
--# CC = gcc
-+CC = gcc
- 
- # This may help with some versions of make
- SHELL = /bin/sh
-@@ -42,13 +42,13 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+SMBLOGFILE = $(VARDIR)/log/log.smb
-+NMBLOGFILE = $(VARDIR)/log/log.nmb
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = $(VARDIR)/lock/samba
- 
- # set this to the default group you want your machine to appear in
- # for browsing. This can also be set in nmbd (see nmbd(8))
-@@ -71,8 +71,8 @@
- 
- # This is for PAM authentication. RedHat Linux uses PAM.
- # If you use PAM, then uncomment the following lines:
--# PAM_FLAGS = -DUSE_PAM
--# PAM_LIBS = -ldl -lpam
-+PAM_FLAGS = -DUSE_PAM
-+PAM_LIBS = -ldl -lpam
- 
- # This is for AFS authentication.  If you use AFS then set AFS_BASE 
- # according to your system layout, and uncomment the other lines as well.
-@@ -181,8 +181,8 @@
- # contributed by Andrew.Tridgell@anu.edu.au
- # AXPROC defines DEC Alpha Processor
- # FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
--# FLAGSM = -DLINUX -DFAST_SHARE_MODES
--# LIBSM = 
-+FLAGSM = -DLINUX -DFAST_SHARE_MODES
-+LIBSM = 
- 
- # Use this for Linux with shadow passwords and quota
- # contributed by xeno@mix.hive.no
+*** samba-1.9.17/source/Makefile.orig	Sat Jul 12 12:51:39 1997
+--- samba-1.9.17/source/Makefile	Sat Jul 12 12:56:04 1997
+***************
+*** 5,15 ****
+  ###########################################################################
+  
+  # The base directory for all samba files
+! BASEDIR = /usr/local/samba
+  
+  # The base manpages directory to put the man pages in
+  # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
+! MANDIR = /usr/local/man
+  
+  # The directories to put things in. If you use multiple
+  # architectures or share the samba binaries across NFS then
+--- 5,15 ----
+  ###########################################################################
+  
+  # The base directory for all samba files
+! BASEDIR = /usr
+  
+  # The base manpages directory to put the man pages in
+  # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
+! MANDIR = $(BASEDIR)/man
+  
+  # The directories to put things in. If you use multiple
+  # architectures or share the samba binaries across NFS then
+***************
+*** 18,26 ****
+  #       normally only applies to nmbd and smbd
+  #       SBINDIR implies a secure binary directory
+  BINDIR = $(BASEDIR)/bin
+! SBINDIR = $(BASEDIR)/bin
+! LIBDIR = $(BASEDIR)/lib
+! VARDIR = $(BASEDIR)/var
+  
+  # The permissions to give the executables
+  INSTALLPERMS = 0755
+--- 18,26 ----
+  #       normally only applies to nmbd and smbd
+  #       SBINDIR implies a secure binary directory
+  BINDIR = $(BASEDIR)/bin
+! SBINDIR = $(BASEDIR)/sbin
+! LIBDIR = /etc
+! VARDIR = /var
+  
+  # The permissions to give the executables
+  INSTALLPERMS = 0755
+***************
+*** 35,41 ****
+  
+  # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
+  # use cc, instead you will have to use gcc. 
+! # CC = gcc
+  
+  # This may help with some versions of make
+  SHELL = /bin/sh
+--- 35,41 ----
+  
+  # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
+  # use cc, instead you will have to use gcc. 
+! CC = gcc
+  
+  # This may help with some versions of make
+  SHELL = /bin/sh
+***************
+*** 48,60 ****
+  # set these to where to find various files
+  # These can be overridden by command line switches (see smbd(8))
+  # or in smb.conf (see smb.conf(5))
+! SMBLOGFILE = $(VARDIR)/log.smb
+! NMBLOGFILE = $(VARDIR)/log.nmb
+  CONFIGFILE = $(LIBDIR)/smb.conf
+  LMHOSTSFILE = $(LIBDIR)/lmhosts
+  
+  # the directory where lock files go
+! LOCKDIR = $(VARDIR)/locks
+  
+  # set this to the default group you want your machine to appear in
+  # for browsing. This can also be set in nmbd (see nmbd(8))
+--- 48,60 ----
+  # set these to where to find various files
+  # These can be overridden by command line switches (see smbd(8))
+  # or in smb.conf (see smb.conf(5))
+! SMBLOGFILE = $(VARDIR)/log/samba/log.smb
+! NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
+  CONFIGFILE = $(LIBDIR)/smb.conf
+  LMHOSTSFILE = $(LIBDIR)/lmhosts
+  
+  # the directory where lock files go
+! LOCKDIR = $(VARDIR)/lock/samba
+  
+  # set this to the default group you want your machine to appear in
+  # for browsing. This can also be set in nmbd (see nmbd(8))
+***************
+*** 77,84 ****
+  
+  # This is for PAM authentication. RedHat Linux uses PAM.
+  # If you use PAM, then uncomment the following lines:
+! # PAM_FLAGS = -DUSE_PAM
+! # PAM_LIBS = -ldl -lpam
+  
+  # This is for AFS authentication.  If you use AFS then set AFS_BASE 
+  # according to your system layout, and uncomment the other lines as well.
+--- 77,84 ----
+  
+  # This is for PAM authentication. RedHat Linux uses PAM.
+  # If you use PAM, then uncomment the following lines:
+! PAM_FLAGS = -DUSE_PAM
+! PAM_LIBS = -ldl -lpam
+  
+  # This is for AFS authentication.  If you use AFS then set AFS_BASE 
+  # according to your system layout, and uncomment the other lines as well.
+***************
+*** 187,194 ****
+  # contributed by Andrew.Tridgell@anu.edu.au
+  # AXPROC defines DEC Alpha Processor
+  # FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
+! # FLAGSM = -DLINUX -DFAST_SHARE_MODES
+! # LIBSM = 
+  
+  # Use this for Linux with shadow passwords and quota
+  # contributed by xeno@mix.hive.no
+--- 187,194 ----
+  # contributed by Andrew.Tridgell@anu.edu.au
+  # AXPROC defines DEC Alpha Processor
+  # FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
+! FLAGSM = -DLINUX -DFAST_SHARE_MODES
+! LIBSM = 
+  
+  # Use this for Linux with shadow passwords and quota
+  # contributed by xeno@mix.hive.no
diff --git a/examples/redhat/samba.spec b/examples/redhat/samba.spec
index f019f5fbc57..cecedc91ebd 100644
--- a/examples/redhat/samba.spec
+++ b/examples/redhat/samba.spec
@@ -2,7 +2,7 @@ Summary: SMB client and server
 Name: samba
 %define	version 1.9.17
 Version: %{version}
-Release: 2
+Release: 3
 Copyright: GPL
 Group: Networking
 Source: ftp://samba.anu.edu.au/pub/samba/samba-%{version}.tar.gz
@@ -37,9 +37,9 @@ make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT/etc
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc0.d
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc1.d
@@ -47,12 +47,16 @@ mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc2.d
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc3.d
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc5.d
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc6.d
+mkdir -p $RPM_BUILD_ROOT/home/samba
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/man/man1
 mkdir -p $RPM_BUILD_ROOT/usr/man/man5
 mkdir -p $RPM_BUILD_ROOT/usr/man/man7
 mkdir -p $RPM_BUILD_ROOT/usr/man/man8
+mkdir -p $RPM_BUILD_ROOT/var/lock/samba
+mkdir -p $RPM_BUILD_ROOT/var/log/samba
+mkdir -p $RPM_BUILD_ROOT/var/spool/samba
 
 cd source
 cd ..
@@ -84,6 +88,9 @@ install -m644 examples/simple/smb.conf $RPM_BUILD_ROOT/etc/smb.conf.sampl
 install -m644 examples/redhat/smb.conf $RPM_BUILD_ROOT/etc/smb.conf
 install -m644 examples/redhat/smbprint $RPM_BUILD_ROOT/usr/bin
 install -m755 examples/redhat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
+install -m644 examples/redhat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
+install -m644 examples/redhat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
+
 ln -sf /etc/rc.d/init.d/smb $RPM_BUILD_ROOT/etc/rc.d/rc0.d/K35smb
 ln -sf /etc/rc.d/init.d/smb $RPM_BUILD_ROOT/etc/rc.d/rc1.d/K35smb
 ln -sf /etc/rc.d/init.d/smb $RPM_BUILD_ROOT/etc/rc.d/rc2.d/K35smb
@@ -91,24 +98,12 @@ ln -sf /etc/rc.d/init.d/smb $RPM_BUILD_ROOT/etc/rc.d/rc3.d/S91smb
 ln -sf /etc/rc.d/init.d/smb $RPM_BUILD_ROOT/etc/rc.d/rc5.d/S91smb
 ln -sf /etc/rc.d/init.d/smb $RPM_BUILD_ROOT/etc/rc.d/rc6.d/K35smb
 
-mkdir -p $RPM_BUILD_ROOT/home/samba
-mkdir -p $RPM_BUILD_ROOT/var/lock/samba
-chmod 775 $RPM_BUILD_ROOT/home/samba
-install -m 644 examples/redhat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -d /etc/pam.d ]; then
-install -m 644 examples/redhat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
-else
-/sbin/pamconfig --add --service=samba --password=none --sesslist=none
-fi
-
-if [ ! -f /var/log/samba ]; then
-	touch /var/log/samba
-	chmod 600 /var/log/samba
+if [ "$1" = 0 ] ; then
+      /sbin/pamconfig --add --service=samba --password=none --sesslist=none
 fi
 
 %postun
@@ -120,6 +115,9 @@ if [ "$1" = 0 ] ; then
       /sbin/pamconfig --remove --service=samba --password=none --sesslist=none
     fi
   fi
+  if [ -e /var/log/samba ]; then
+    rm -rf /var/log/samba
+  fi
 fi
 
 %files
@@ -151,9 +149,7 @@ fi
 %attr(-,root,root) %config /etc/rc.d/rc6.d/K35smb
 %attr(-,root,root) %config /etc/rc.d/rc2.d/K35smb
 %attr(-,root,root) %config /etc/logrotate.d/samba
-if [ -x /etc/pam.d/samba ]; then
- %attr(-,root,root) %config /etc/pam.d/samba
-fi
+%attr(-,root,root) %config /etc/pam.d/samba
 %attr(-,root,root) /usr/man/man1/smbstatus.1
 %attr(-,root,root) /usr/man/man1/smbclient.1
 %attr(-,root,root) /usr/man/man1/smbrun.1
@@ -166,3 +162,5 @@ fi
 %attr(-,root,root) /usr/man/man8/nmbd.8
 %attr(-,root,nobody) %dir /home/samba
 %attr(-,root,root) %dir /var/lock/samba
+%attr(-,root,root) %dir /var/log/samba
+%attr(777,root,root) %dir /var/spool/samba
diff --git a/examples/redhat/smb.conf b/examples/redhat/smb.conf
index d615580710a..37c20353630 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
-
diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index 1158eb47296..a815a29011f 100644
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -1,4 +1,5 @@
 ; The global setting for a default install
+; Copyright(C) John H Terpstra - 1997
 ;======================= Global Settings =====================================
 [global]