This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to be commit 35510176fd4feab6c1e3da2ee0ae791f9a064a2e)

3 files changed, 80 insertions, 0 deletions

diff --git a/docs/docbook/smbdotconf/security/createmask.xml b/docs/docbook/smbdotconf/security/createmask.xml
new file mode 100644
index 0000000000..4a581d3a19
--- /dev/null
+++ b/docs/docbook/smbdotconf/security/createmask.xml
@@ -0,0 +1,45 @@
+<samba:parameter name="create mask"
+                 context="S"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>A synonym for this parameter is 
+    <link linkend="CREATEMODE"><parameter moreinfo="none">create mode</parameter>
+    </link>.</para>
+
+    <para>When a file is created, the necessary permissions are 
+    calculated according to the mapping from DOS modes to UNIX 
+    permissions, and the resulting UNIX mode is then bit-wise 'AND'ed 
+    with this parameter. This parameter may be thought of as a bit-wise 
+    MASK for the UNIX modes of a file. Any bit <emphasis>not</emphasis> 
+    set here will be removed from the modes set on a file when it is 
+    created.</para>
+
+    <para>The default value of this parameter removes the 
+    'group' and 'other' write and execute bits from the UNIX modes.</para>
+
+    <para>Following this Samba will bit-wise 'OR' the UNIX mode created 
+    from this parameter with the value of the <link linkend="FORCECREATEMODE">
+    <parameter moreinfo="none">force create mode</parameter></link>
+    parameter which is set to 000 by default.</para>
+
+    <para>This parameter does not affect directory modes. See the 
+    parameter <link linkend="DIRECTORYMODE"><parameter moreinfo="none">directory mode
+    </parameter></link> for details.</para>
+
+    <para>See also the <link linkend="FORCECREATEMODE"><parameter moreinfo="none">force 
+    create mode</parameter></link> parameter for forcing particular mode 
+    bits to be set on created files. See also the <link linkend="DIRECTORYMODE">
+    <parameter moreinfo="none">directory mode</parameter></link> parameter for masking 
+    mode bits on created directories.  See also the <link linkend="INHERITPERMISSIONS">
+    <parameter moreinfo="none">inherit permissions</parameter></link> parameter.</para>
+
+    <para>Note that this parameter does not apply to permissions
+    set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+    a mask on access control lists also, they need to set the <link linkend="SECURITYMASK">
+    <parameter moreinfo="none">security mask</parameter></link>.</para>
+
+    <para>Default: <command moreinfo="none">create mask = 0744</command></para>
+
+    <para>Example: <command moreinfo="none">create mask = 0775</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/security/minpasswordlength.xml b/docs/docbook/smbdotconf/security/minpasswordlength.xml
new file mode 100644
index 0000000000..6f73d9b52f
--- /dev/null
+++ b/docs/docbook/smbdotconf/security/minpasswordlength.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="min password length"
+                 context="G"
+                 advanced="1" developer="1"
+		 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This option sets the minimum length in characters of a
+    plaintext password that <command moreinfo="none">smbd</command> will
+    accept when performing  UNIX password changing.</para>
+
+    <para>See also <link linkend="UNIXPASSWORDSYNC"><parameter moreinfo="none">unix 
+    password sync</parameter></link>, <link linkend="PASSWDPROGRAM">
+    <parameter moreinfo="none">passwd program</parameter></link> and <link linkend="PASSWDCHATDEBUG">
+    <parameter moreinfo="none">passwd chat debug</parameter></link>.</para>
+
+    <para>Default: <command moreinfo="none">min password length = 5</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/security/preloadmodules.xml b/docs/docbook/smbdotconf/security/preloadmodules.xml
new file mode 100644
index 0000000000..7b4e57cff1
--- /dev/null
+++ b/docs/docbook/smbdotconf/security/preloadmodules.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="preload modules"
+		 context="G"
+		 basic="1"
+		 xmlns:samba="http://samba.org/common">
+<listitem>
+	<para>This is a list of paths to modules that should
+	be loaded into smbd before a client connects. This improves
+	the speed of smbd when reacting to new connections somewhat. </para>
+
+	<para>It is recommended to only use this option on heavy-performance
+	servers.</para> 
+
+	<para>Default: <command>preload modules = </command></para>
+
+	<para>Example: <command>preload modules = /usr/lib/samba/passdb/mysql.so+++ </command></para>
+
+	</listitem>
+</samba:parameter>