sync 3_0 branch with HEAD

(This used to be commit 19ab776bf9c91cf4e56887fd7a63d3253b7e36ef)

2 files changed, 87 insertions, 21 deletions

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 641e36f57a..1e713147c9 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -728,7 +728,7 @@
 		<listitem><para><link linkend="SOCKETADDRESS"><parameter>socket address</parameter></link></para></listitem>
 		<listitem><para><link linkend="SOCKETOPTIONS"><parameter>socket options</parameter></link></para></listitem>
 		<listitem><para><link linkend="SOURCEENVIRONMENT"><parameter>source environment</parameter></link></para></listitem>
-
+                <listitem><para><link linkend="SPNEGO"><parameter>use spnego</parameter></link></para></listitem>
 		<listitem><para><link linkend="STATCACHE"><parameter>stat cache</parameter></link></para></listitem>
 		<listitem><para><link linkend="STATCACHESIZE"><parameter>stat cache size</parameter></link></para></listitem>
 		<listitem><para><link linkend="STRIPDOT"><parameter>strip dot</parameter></link></para></listitem>
@@ -1102,7 +1102,13 @@
 		%u</command></para>
 		</listitem>
 		</varlistentry>
+<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) 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.
+		</ulink> 
 
+</para></listitem>
+</varlistentry>
 
 
 		<varlistentry>
@@ -1910,6 +1916,7 @@
                 <para>This script is called when a remote client removes a user
                 from the server, normally using 'User Manager for Domains' or
                 <command>rpcclient</command>.
+		</para>
 
 		<para>This script should delete the given UNIX username. 
 		</para>
@@ -2762,6 +2769,10 @@
 		<command>su -</command> command) and trying to print using the 
 		system print command such as <command>lpr(1)</command> or <command>
 		lp(1)</command>.</para>
+
+	        <para>This paramater does not accept % marcos, becouse
+	        many parts of the system require this value to be
+	        constant for correct operation</para>
 		
 		<para>Default: <emphasis>specified at compile time, usually 
 		"nobody"</emphasis></para>
@@ -3281,10 +3292,9 @@
 
 		<varlistentry>
 		<term><anchor id="LDAPADMINDN">ldap admin dn (G)</term>
-		<para>
-		The <parameter>ldap admin dn</parameter> defines the Distinguished 
-		Name (DN) name used by Samba to contact the <link linkend="LDAPSERVER">ldap
-		server</link> when retreiving user account information. The <parameter>ldap
+		<listitem><para> The <parameter>ldap admin dn</parameter> defines the Distinguished 
+		Name (DN) name used by Samba to contact the ldap server when retreiving 
+		user account information. The <parameter>ldap
 		admin dn</parameter> is used in conjunction with the admin dn password
 		stored in the <filename>private/secrets.tdb</filename> file.  See the
 		<ulink url="smbpasswd.8.html"><command>smbpasswd(8)</command></ulink> man
@@ -3301,8 +3311,7 @@
 
 		<varlistentry>
 		<term><anchor id="LDAPFILTER">ldap filter (G)</term>
-		<para>
-		This parameter specifies the RFC 2254 compliant LDAP search filter.
+		<listitem><para>This parameter specifies the RFC 2254 compliant LDAP search filter.
 		The default is to match the login name with the <constant>uid</constant> 
 		attribute for all entries matching the <constant>sambaAccount</constant>		
 		objectclass.  Note that this filter should only return one entry.
@@ -3316,10 +3325,9 @@
 
 		<varlistentry>
 		<term><anchor id="LDAPSSL">ldap ssl (G)</term>
-		<para>
-		This option is used to define whether or not Samba should
-		use SSL when connecting to the <link linkend="LDAPSERVER"><parameter>ldap
-		server</parameter></link>.  This is <emphasis>NOT</emphasis> related to
+		<listitem><para>This option is used to define whether or not Samba should
+		use SSL when connecting to the ldap server
+		This is <emphasis>NOT</emphasis> related to
 		Samba's previous SSL support which was enabled by specifying the 
 		<command>--with-ssl</command> option to the <filename>configure</filename> 
 		script.
@@ -3365,7 +3373,7 @@
 
 
 		<varlistentry>
-		<term><anchor id="LDAPSUFFIX">ldap machine suffix (G)</term>
+		<term><anchor id="LDAPMACHINESUFFIX">ldap machine suffix (G)</term>
 		<listitem><para>It specifies where machines should be 
                 added to the ldap tree.
 		</para>
@@ -3606,15 +3614,18 @@
 
 		<varlistentry>
 		<term><anchor id="LOGLEVEL">log level (G)</term>
-		<listitem><para>The value of the parameter (an integer) allows 
+		<listitem><para>The value of the parameter (a astring) allows 
 		the debug level (logging level) to be specified in the 
-		<filename>smb.conf</filename> file. This is to give greater 
+		<filename>smb.conf</filename> file. This parameter has been
+		extended since 2.2.x series, now it allow to specify the debug
+		level for multiple debug classes. This is to give greater 
 		flexibility in the configuration of the system.</para>
 
 		<para>The default will be the log level specified on 
 		the command line or level zero if none was specified.</para>
 
-		<para>Example: <command>log level = 3</command></para></listitem>
+		<para>Example: <command>log level = 3 passdb:5 auth:10 winbind:2
+		</command></para></listitem>
 		</varlistentry>
 
 
@@ -6959,7 +6970,12 @@
 		/usr/local/smb_env_vars</command></para>
 		</listitem>
 		</varlistentry>
-
+<varlistentry>
+<term><anchor id="SPNEGO">use spnego (G)</term>
+<listitem><para> This variable controls controls whether samba will try to use Simple and Protected NEGOciation (as specified by rfc2478) with WindowsXP and Windows2000sp2 clients to agree upon an authentication mechanism.  As of samba 3.0alpha it must be set to "no" for these clients to join a samba domain controller.  It can be set to "yes" to allow samba to participate in an AD domain controlled by a Windows2000 domain controller.</para>
+<para>Default:  <emphasis>use spnego = yes</emphasis></para>
+</listitem>
+</varlistentry>
 
 		<varlistentry>
 		<term><anchor id="STATCACHE">stat cache (G)</term>
@@ -7570,6 +7586,12 @@
 		connection is made to a Samba server. Sites may use this to record the
 		user connecting to a Samba share.</para>
 
+	        <para>Due to the requirements of the utmp record, we
+	        are required to create a unique identifier for the
+	        incoming user.  Enabling this option creates an n^2
+	        algorithm to find this number.  This may impede
+	        performance on large installations. </para>
+
 		<para>See also the <link linkend="UTMPDIRECTORY"><parameter>
 		utmp directory</parameter></link> parameter.</para>
 
diff --git a/docs/docbook/manpages/smbcontrol.1.sgml b/docs/docbook/manpages/smbcontrol.1.sgml
index 517e2ca41f..9a6f31b336 100644
--- a/docs/docbook/manpages/smbcontrol.1.sgml
+++ b/docs/docbook/manpages/smbcontrol.1.sgml
@@ -76,7 +76,7 @@
 		<constant>force-election</constant>, <constant>ping
 		</constant>, <constant>profile</constant>, <constant>
 		debuglevel</constant>, <constant>profilelevel</constant>, 
-		or <constant>printer-notify</constant>.</para>
+		or <constant>printnotify</constant>.</para>
 
 		<para>The <constant>close-share</constant> message-type sends a 
 		message to smbd which will then close the client connections to
@@ -119,11 +119,55 @@
 		setting is returned by a  "profilelevel" message. This can be sent 
 		to any smbd or nmbd destinations.</para>
 
-		<para>The <constant>printer-notify</constant> message-type sends a 
+		<para>The <constant>printnotify</constant> message-type sends a 
 		message to smbd which in turn sends a printer notify message to 
-		any Windows NT clients connected to  a printer.  This message-type 
-		takes an argument of the printer name to  send notify messages to.   
-		This message can only be sent to <constant>smbd</constant>.</para>
+		any Windows NT clients connected to  a printer. This message-type
+		takes the following arguments:
+
+		<variablelist>
+
+		    <varlistentry>
+		    <term>queuepause printername</term>
+		    <listitem><para>Send a queue pause change notify
+		    message to the printer specified.</para></listitem>
+ 		    </varlistentry>
+
+		    <varlistentry>
+		    <term>queueresume printername</term>
+		    <listitem><para>Send a queue resume change notify
+		    message for the printer specified.</para></listitem>
+ 		    </varlistentry>
+
+		    <varlistentry>
+		    <term>jobpause printername unixjobid</term>
+		    <listitem><para>Send a job pause change notify
+		    message for the printer and unix jobid
+		    specified.</para></listitem> 
+ 		    </varlistentry>
+
+		    <varlistentry>
+		    <term>jobresume printername unixjobid</term>
+		    <listitem><para>Send a job resume change notify
+		    message for the printer and unix jobid
+		    specified.</para></listitem>  
+		    </varlistentry>
+
+		    <varlistentry>
+		    <term>jobdelete printername unixjobid</term>
+		    <listitem><para>Send a job delete change notify
+		    message for the printer and unix jobid
+		    specified.</para></listitem> 
+		    </varlistentry>
+
+		</variablelist>
+
+		Note that this message only sends notification that an
+		event has occured.  It doesn't actually cause the
+		event to happen.
+
+		This message can only be sent to <constant>smbd</constant>. 
+		</para>
+
 		</listitem>
 		</varlistentry>