ENCRYPTION.txt: Fixed typo.

Support.txt: Added consultant.
smb.conf.5: Updated with new parameters.
Jeremy.
(This used to be commit 71c70cf090b749827ae4186a6d389864708b7899)

3 files changed, 122 insertions, 26 deletions

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index ed84d86e4b..a327b0f193 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -293,6 +293,34 @@ gets it wrong then sending me a level 3 log should allow me to fix it.
 There are some quite creative things that can be done with these
 substitutions and other smb.conf options.
 
+.B New for 1.9.18p3 and above.
+
+Thanks to a patch from Branko Cibej, Samba can now expand environment
+variables in the smb.conf file.
+
+To embed an environment variable, use the syntax :
+
+%$(ENVIRONMENT_VARIABLE_NAME)
+
+(substitute 'ENVIRONMENT_VARIABLE_NAME' with the name of the
+environment variable you wish to have substituted at this point.
+
+The entire '%$(ENVIRONMENT_VARIABLE_NAME)' string will be replaced
+by the contents of the environment variable. If a non-existing
+environment variable is specified, the original string will be
+left alone (and will probably cause a parsing error in the smb.conf
+at that point).
+
+Remember, the environment used will be that of the smbd/nmbd process,
+not that of the connecting user. As this is usually started at boot 
+time, then it will be very different from that of a normal user. 
+Remember to add any special variables into the environment before 
+starting the master smbd/nmbd.
+
+If smbd/nmbd is run from inetd, then the environment used will be
+inherited from inetd. In this case you will need to specify
+any special variables before starting inetd.
+
 .SS NAME MANGLING
 
 Samba supports "name mangling" so that DOS and Windows clients can use
@@ -516,7 +544,13 @@ use rhosts
 
 valid chars
 
-veto files
+win95 bug compatibility
+
+wins proxy
+
+wins server
+
+wins support
 
 workgroup
 
@@ -625,6 +659,8 @@ max connections
 
 min print space
 
+networkstation user login
+
 only guest
 
 only user
@@ -685,6 +721,8 @@ users
 
 valid users
 
+veto files
+
 veto oplock files
 
 volume
@@ -2391,6 +2429,20 @@ server listed there.
 .B Example:
 	nis homedir = true
 
+.SS networkstation user login (G)
+This global parameter (new for 1.9.18p3) affects server level security.
+With this set (recommended) samba will do a full NetWkstaUserLogon to
+confirm that the client really should have login rights. This can cause
+problems with machines in trust relationships in which case you can
+disable it here, but be warned, we have heard that some NT machines
+will then allow anyone in with any password! Make sure you test it.
+
+.B Default:
+	networkstation user login = yes
+
+.B Example:
+	networkstation user login = no
+
 .SS null passwords (G)
 Allow or disallow access to accounts that have null passwords. 
 
@@ -3175,19 +3227,18 @@ Pathworks documentation for details.
  	set directory = yes
 
 .SS shared file entries (G)
-This parameter is only useful when Samba has been compiled with FAST_SHARE_MODES.
-It specifies the number of hash bucket entries used for share file locking.
-You should never change this parameter unless you have studied the source 
-and know what you are doing.
-
-.B Default
-	shared file entries = 113
+This parameter has been removed (as of Samba 1.9.18 and above). The new
+System V shared memory code prohibits the user from allocating the
+share hash bucket size directly.
 
 .SS shared mem size (G)
 This parameter is only useful when Samba has been compiled with FAST_SHARE_MODES.
 It specifies the size of the shared memory (in bytes) to use between smbd 
 processes. You should never change this parameter unless you have studied 
-the source and know what you are doing.
+the source and know what you are doing. This parameter defaults to 1024
+multiplied by the setting of the maximum number of open files in the
+file local.h in the Samba source code. MAX_OPEN_FILES is normally set
+to 100, so this parameter defaults to 102400 bytes.
 
 .B Default
 	shared mem size = 102400
@@ -3736,6 +3787,28 @@ only to areas that are outside the directory tree being exported.
 .B Example:
  	wide links = no
 
+.SS win95 bug compatibility (G)
+
+This boolean controls the behavior of smbd with respect to the reporting
+of 'access time' on files and directories. With this set to true, Samba
+will return the modify time (UNIX mtime) as the access time to the client.
+
+This is sometimes desirable due to the fact that in Windows, a files
+access time is only updated when the file is closed, whereas on UNIX,
+a files access time is updated as soon as it is read. For Visual C++
+to work correctly on a Samba share with oplocks, it is desirable to
+set this parameter to 'yes'. This parameter also causes Samba to
+swap the Date and Time information in two of the trans2 SMB calls,
+as a Windows 95 server does. Other bug-for-bug compatible fixes
+will also be turned on by setting this flag as the need arises
+to be bug compatible with a Windows 95 server.
+
+.B Default:
+        win95 bug compatibility = no
+
+.B Example:
+        win95 bug compatibility = yes
+
 .SS wins proxy (G)
 
 This is a boolean that controls if nmbd will respond to broadcast name
@@ -3757,8 +3830,8 @@ network.
 
 .SS wins support (G)
 
-This boolean controls if Samba will act as a WINS server. You should
-not set this to true unless you have a multi-subnetted network and
+This boolean controls if the nmbd process in Samba will act as a WINS server. 
+You should not set this to true unless you have a multi-subnetted network and
 you wish a particular nmbd to be your WINS server. Note that you
 should *NEVER* set this to true on more than one machine in your
 network.
diff --git a/docs/textdocs/ENCRYPTION.txt b/docs/textdocs/ENCRYPTION.txt
index e55878aa34..315e7de53f 100644
--- a/docs/textdocs/ENCRYPTION.txt
+++ b/docs/textdocs/ENCRYPTION.txt
@@ -22,7 +22,7 @@ How does it work ?
 
 LanManager encryption is somewhat similar to UNIX password
 encryption. The server uses a file containing a hashed value of a
-users password.  This is created by taking the users paintext
+users password.  This is created by taking the users plaintext
 password, capitalising it, and either truncating to 14 bytes (or
 padding to 14 bytes with null bytes). This 14 byte value is used as
 two 56 bit DES keys to encrypt a 'magic' eight byte value, forming a
diff --git a/docs/textdocs/Support.txt b/docs/textdocs/Support.txt
index 79d7606881..06932d6d98 100644
--- a/docs/textdocs/Support.txt
+++ b/docs/textdocs/Support.txt
@@ -38,7 +38,7 @@ Region                             Number of entries
     ASIA                                          1
     AUSTRALIA & NEW ZEALAND                      18
     CANADA                                        8
-    EUROPE                                       38
+    EUROPE                                       39
     MIDDLE EAST                                   1
 
 AFRICA
@@ -1364,31 +1364,36 @@ Samba experience:  BSD/OS, Linux, LynxOS <==> WFWG, NT
 ------------------------------------------------------------------------------
 
 ------------------------------------------------------------------------------
-LEICESTERSHIRE - ENGLAND
+LEICESTERSHIRE  ENGLAND
 
 TECTONIC LIMITED
 WESTWOOD
 78 LOUGHBOROUGH ROAD
 QUORN
+LOUGHBOROUGH
 LEICESTERSHIRE
 LE12 8DX
+UNITED KINGDOM
 
-TELEPHONE 01509-620922
-FAX       01509-620933
+Telephone: +44 (0) 1509 620922  Fax: +44 (0) 1509 620933
 
-Contact Samantha Hull
+Contact: Nick Berry     nick.berry@tectonic.co.uk
 
-We are unix orientated but also specialise in pc to unix communications, we 
-know and understand pc-nfs, (hence our interest in samba).
-we support sunos, solaris 1.x and 2.x, hp-ux 9.0 and 10.0, osf (or dec unix, 
-whichever you prefer), winnt, wfwg and win95.
+Tectonic is a Unix specialist company, with the expertise to provide
+consultancy and integrated solutions for a wide range of Information
+Technology needs.  We support three major Unix operating systems (Solaris,
+AIX and HP-UX) and PC operating systems including Windows NT, Windows 95
+and Windows for Workgroups.  Tectonic is truly an Open Systems company.
 
-We are already talking to a couple of very large samba users here in the uk. 
-Tectonic are in the process of creating the UK SAMBA USER GROUP and would
-appreciate any feedback or queries.
+Tectonic has been using Samba in house and providing support since 1995.
+We currently support a dozen large organizations in varying business
+sectors including business critical areas.
 
-For samba support, and for details on the UK SAMBA USER GROUP, please contact
-me at: sam@tectonic.demon.co.uk
+Tectonic provides Samba support, technical expertise, upgrades and
+information bulletins.
+
+For more information about support please contact:
+nick.berry@tectonic.co.uk
 
 ------------------------------------------------------------------------------
 
@@ -1927,6 +1932,24 @@ support for Samba.
 ------------------------------------------------------------------------------
 
 ------------------------------------------------------------------------------
+BERN - SWITZERLAND
+
+Charles Bueche           e-mail : cbueche@worldcom.ch
+Les Morels 9             phone  : +41.(0)79.330.00.70
+2515 Preles              fax    : +41.(0)32.315.52.16
+Switzerland
+
+I have used Samba for more than 4 years across several 
+large Swiss companies. I offer support on planing, 
+configuration and maintenance of Samba. My primary 
+platform is Sun Solaris, but I can also support 
+Samba on SunOS, HP, DEC-UNIX, or Linux.
+
+Other duties includes security audits (Inter- & Intranet),
+Sun High Availability and Checkpoint Firewall-1.
+------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------