summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/smbdotconf/logon/abortshutdownscript.xml8
-rw-r--r--docs/smbdotconf/logon/shutdownscript.xml16
-rw-r--r--docs/smbdotconf/security/inheritowner.xml21
3 files changed, 34 insertions, 11 deletions
diff --git a/docs/smbdotconf/logon/abortshutdownscript.xml b/docs/smbdotconf/logon/abortshutdownscript.xml
index 60978b6835..d41a98cd66 100644
--- 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 3ef072801a..1866972ba4 100644
--- 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
index 0000000000..ba4fc617cb
--- /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>