correct '[abort] shutdown script' explanation (has been in 3.0.x

for a while now).

add basic description of 'inherit owner' parameter
(jra, feel free to add more to this for describing the
drop-box scenario).

diff --git a/docs/smbdotconf/logon/abortshutdownscript.xml b/docs/smbdotconf/logon/abortshutdownscript.xml
index 60978b6835911e4d6a8e63382d3c7c59a59a3211..d41a98cd66bed7e3a7104947732398c98b8ff148 100644 (file)
--- a/docs/smbdotconf/logon/abortshutdownscript.xml
+++ b/docs/smbdotconf/logon/abortshutdownscript.xml
@@ -1,16 +1,16 @@
 <samba:parameter name="abort shutdown script"
                  context="G"
                  advanced="1" developer="1"
-                                type="string"
+                type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-       <para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis>
-       This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle>
+       <para>This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle>
        <manvolnum>8</manvolnum></citerefentry> that
        should stop a shutdown procedure issued by the <link linkend="SHUTDOWNSCRIPT">
        <parameter moreinfo="none">shutdown script</parameter></link>.</para>
                
-       <para>This command will be run as user.</para>
+       <para>If the connected user posseses the <constant>SeRemoteShutdownPrivilege</constant>,
+       right, this command will be run as user.</para>
 </description>
 <value type="default"></value>
 <value type="example">/sbin/shutdown -c</value>

diff --git a/docs/smbdotconf/logon/shutdownscript.xml b/docs/smbdotconf/logon/shutdownscript.xml
index 3ef072801a9952471bf9598f044d02e3c89657d0..1866972ba47edb1f871af56616e80c27bb526152 100644 (file)
--- a/docs/smbdotconf/logon/shutdownscript.xml
+++ b/docs/smbdotconf/logon/shutdownscript.xml
@@ -1,20 +1,22 @@
 <samba:parameter name="shutdown script"
                  context="G"
-                                type="string"
+                type="string"
                  advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-       <para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis>
-       This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle>                                                    
-        <manvolnum>8</manvolnum></citerefentry> that should start a shutdown procedure.</para>
+       <para>This a full path name to a script called by 
+       <citerefentry><refentrytitle>smbd</refentrytitle> 
+        <manvolnum>8</manvolnum></citerefentry> that should 
+       start a shutdown procedure.</para>
 
-       <para>This command will be run as the user connected to the server.</para>
+       <para>If the connected user posseses the <constant>SeRemoteShutdownPrivilege</constant>,
+       right, this command will be run as user.</para>
 
-       <para>%m %t %r %f parameters are expanded:</para>
+       <para>The %z %t %r %f variables are expanded as follows:</para>
        
        <itemizedlist>
                <listitem>
-                       <para><parameter moreinfo="none">%m</parameter> will be substituted with the
+                       <para><parameter moreinfo="none">%z</parameter> will be substituted with the
                        shutdown message sent to the server.</para>
                </listitem>
                

diff --git a/docs/smbdotconf/security/inheritowner.xml b/docs/smbdotconf/security/inheritowner.xml
new file mode 100644 (file)
index 0000000..ba4fc61
--- /dev/null
+++ b/docs/smbdotconf/security/inheritowner.xml
@@ -0,0 +1,21 @@
+<samba:parameter name="inherit owner"
+                 context="S"
+                type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+       <para>The ownership of new files and directories 
+       is normally governed by effective uid of the connected user.
+       This option allows the Samba administrator to specify that
+       the ownership for new files and directories should be controlled
+       by the ownership of the parent directory.</para>
+       
+       <para>Common scenarios where this behavior is useful is in 
+       implementing drop-boxes where users can create and edit files but not 
+       delete them and to ensure that newly create files in a user's
+       roaming profile directory are actually owner by the user.</para>
+</description>
+
+<related>inherit permissions</related>
+
+<value type="default">no</value>
+</samba:parameter>