merge from HEAD

(This used to be commit c0ca286e36d49deba6c73690114b0d867cbfd63e)

3 files changed, 68 insertions, 33 deletions

diff --git a/docs/docbook/manpages/samba.7.sgml b/docs/docbook/manpages/samba.7.sgml
index ce443e78d9..17865edd81 100644
--- a/docs/docbook/manpages/samba.7.sgml
+++ b/docs/docbook/manpages/samba.7.sgml
@@ -124,7 +124,7 @@
 	<para>If you require help, visit the Samba webpage at
 	<ulink url="http://samba.org/">http://www.samba.org/</ulink> and
 	explore the many option available to you.
-	
+	</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index d22ed39de5..c0893f1005 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -656,8 +656,9 @@
 		<listitem><para><link linkend="LDAPFILTER"><parameter>ldap filter</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPSSL"><parameter>ldap ssl</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPSUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
-		<listitem><para><link linkend="LDAPUSERSUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
-		<listitem><para><link linkend="LDAPMACHINESUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
+		<listitem><para><link linkend="LDAPUSERSUFFIX"><parameter>ldap user suffix</parameter></link></para></listitem>
+		<listitem><para><link linkend="LDAPMACHINESUFFIX"><parameter>ldap machine suffix</parameter></link></para></listitem>
+		<listitem><para><link linkend="LDAPPASSWDSYNC"><parameter>ldap passwd sync</parameter></link></para></listitem>
 
 		<listitem><para><link linkend="LMANNOUNCE"><parameter>lm announce</parameter></link></para></listitem>
 		<listitem><para><link linkend="LMINTERVAL"><parameter>lm interval</parameter></link></para></listitem>
@@ -1138,7 +1139,16 @@
 		
 		<varlistentry><term><anchor id="ADDGROUPSCRIPT">add group script (G)</term>
 		<listitem><para>This is the full pathname to a script that will 
-		be run <emphasis>AS ROOT</emphasis> by <ulink url="smbd.8.html">smbd(8)</ulink> when a new group is requested. It will expand any <parameter>%g</parameter> to the group name passed.  This script is only useful for installations using the Windows NT domain administration tools.
+		be run <emphasis>AS ROOT</emphasis> by <ulink
+                url="smbd.8.html">smbd(8)</ulink> when a new group is
+                requested. It will expand any
+                <parameter>%g</parameter> to the group name passed.
+                This script is only useful for installations using the
+                Windows NT domain administration tools. The script is
+                free to create a group with an arbitrary name to
+                circumvent unix group name restrictions. In that case
+                the script must print the numeric gid of the created
+                group on stdout.
 		</para></listitem>
 		</varlistentry>
 
@@ -3484,13 +3494,16 @@
 		
 		<para>
 		The <parameter>ldap ssl</parameter> can be set to one of three values:
-		(a) <constant>on</constant> - Always use SSL when contacting the 
-		<parameter>ldap	server</parameter>, (b) <constant>off</constant> -
-		Never use SSL when querying the directory, or (c) <constant>start_tls</constant> 
-		- Use the LDAPv3 StartTLS extended operation 
-		(RFC2830) for communicating with the directory server.
-		</para>
-		
+		</para>	
+		<itemizedlist>
+			<listitem><para><parameter>On</parameter>  =  Always use SSL when contacting the 
+			<parameter>ldap	server</parameter>.</para></listitem>
+			
+			<listitem><para><parameter>Off</parameter> = Never use SSL when querying the directory.</para></listitem>
+
+			<listitem><para><parameter>Start_tls</parameter> = Use the LDAPv3 StartTLS extended operation 
+			(RFC2830) for communicating with the directory server.</para></listitem>
+		</itemizedlist>		
 		
 		<para>Default : <command>ldap ssl = on</command></para>
 		</listitem>
@@ -3533,7 +3546,29 @@
 		</listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term><anchor id="LDAPPASSWDSYNC">ldap passwd sync (G)</term>
+		<listitem><para>This option is used to define whether
+		or not Samba should sync the LDAP password with the NT
+		and LM hashes for normal accounts (NOT for
+		workstation, server or domain trusts) on a password
+		change via SAMBA.  
+		</para>
 
+		<para>
+		The <parameter>ldap passwd sync</parameter> can be set to one of three values:
+		</para>
+		<itemizedlist>
+			<listitem><para><parameter>Yes</parameter>  =  Try to update the LDAP, NT and LM passwords and update the pwdLastSet time.</para></listitem>
+			
+			<listitem><para><parameter>No</parameter> = Update NT and LM passwords and update the pwdLastSet time.</para></listitem>
+
+			<listitem><para><parameter>Only</parameter> = Only update the LDAP password and let the LDAP server do the rest.</para></listitem>
+		</itemizedlist>		
+		
+		<para>Default : <command>ldap passwd sync = no</command></para>
+		</listitem>
+		</varlistentry>
 
 
 
diff --git a/docs/docbook/manpages/vfstest.1.sgml b/docs/docbook/manpages/vfstest.1.sgml
index 11878c1c89..9a7eff1939 100644
--- a/docs/docbook/manpages/vfstest.1.sgml
+++ b/docs/docbook/manpages/vfstest.1.sgml
@@ -16,8 +16,8 @@
 	<cmdsynopsis>
 		<command>vfstest</command>
 		<arg choice="opt">-d debuglevel</arg>
-		<arg choice="opt">-c &quot;command&quot;</arg>
-		<arg choice="opt">-l &quot;logfile&quot;</arg>
+		<arg choice="opt">-c command</arg>
+		<arg choice="opt">-l logfile</arg>
 		<arg choice="opt">-h</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
@@ -28,9 +28,9 @@
 	<para>This tool is part of the <ulink url="samba.7.html">
 	Samba</ulink> suite.</para>
 
-	<para><command>vfstest</command> is a small command line 
+	<para><command>vfstest</command> is a small command line
 	utility that has the ability to test dso samba VFS modules. It gives the
-	user the ability to call the various VFS functions manually and 
+	user the ability to call the various VFS functions manually and
 	supports cascaded VFS modules.
 	</para>
 </refsect1>
@@ -43,20 +43,20 @@
 
 		<varlistentry>
 		<term>-c|--command=command</term>
-		<listitem><para>Execute the specified (colon-seperated) commands. 
+		<listitem><para>Execute the specified (colon-seperated) commands.
 		See below for the commands that are available.
-		</para> </listitem> 
+		</para> </listitem>
 		</varlistentry>
 
 		<varlistentry>
 		<term>-d|--debug=debuglevel</term>
-		<listitem><para>set the debuglevel. Debug level 0 is the lowest 
+		<listitem><para>set the debuglevel. Debug level 0 is the lowest
 		and 100 being the highest. This should be set to 100 if you are
-		planning on submitting a bug report to the Samba team (see 
-		<filename>BUGS.txt</filename>). 
+		planning on submitting a bug report to the Samba team (see
+		<filename>BUGS.txt</filename>).
 		</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term>-h|--help</term>
 		<listitem><para>Print a summary of command line options.
@@ -65,8 +65,8 @@
 
 		<varlistentry>
 		<term>-l|--logfile=logbasename</term>
-		<listitem><para>File name for log/debug files. The extension 
-		<constant>'.client'</constant> will be appended. The log file is never removed  
+		<listitem><para>File name for log/debug files. The extension
+		<constant>'.client'</constant> will be appended. The log file is never removed
 		by the client.
 		</para></listitem>
 		</varlistentry>
@@ -81,10 +81,10 @@
 	<para><emphasis>VFS COMMANDS</emphasis></para>
 	<itemizedlist>
 		<listitem><para><command>load &lt;module.so&gt;</command> - Load specified VFS module </para></listitem>
-		
+
 		<listitem><para><command>populate &lt;char&gt; &lt;size&gt;</command> - Populate a data buffer with the specified data
 		</para></listitem>
-		
+
 		<listitem><para><command>showdata [&lt;offset&gt; &lt;len&gt;]</command> - Show data currently in data buffer
 		</para></listitem>
 
@@ -122,9 +122,9 @@
 		<listitem><para><command>mknod</command> - VFS mknod()</para></listitem>
 		<listitem><para><command>realpath</command> - VFS realpath()</para></listitem>
 	</itemizedlist>
-	
+
 	<para><emphasis>GENERAL COMMANDS</emphasis></para>
-	<itemizedlist>	
+	<itemizedlist>
 		<listitem><para><command>conf &lt;smb.conf&gt;</command> - Load a different configuration file</para></listitem>
 
 		<listitem><para><command>help [&lt;command&gt;]</command> - Get list of commands or info about specified command</para></listitem>
@@ -134,25 +134,25 @@
 		<listitem><para><command>freemem</command> - Free memory currently in use</para></listitem>
 
 		<listitem><para><command>exit</command> - Exit vfstest</para></listitem>
-	</itemizedlist>	
+	</itemizedlist>
 
 </refsect1>
 
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 3.0 of the Samba 
+	<para>This man page is correct for version 3.0 of the Samba
 	suite.</para>
 </refsect1>
 
 <refsect1>
 	<title>AUTHOR</title>
-	
-	<para>The original Samba software and related utilities 
+
+	<para>The original Samba software and related utilities
 	were created by Andrew Tridgell. Samba is now developed
-	by the Samba Team as an Open Source project similar 
+	by the Samba Team as an Open Source project similar
 	to the way the Linux kernel is developed.</para>
-	
+
 	<para>The vfstest man page was written by Jelmer Vernooij.</para>
 </refsect1>