summaryrefslogtreecommitdiff
path: root/docs/smbdotconf/locking
diff options
context:
space:
mode:
Diffstat (limited to 'docs/smbdotconf/locking')
-rw-r--r--docs/smbdotconf/locking/strictlocking.xml13
1 files changed, 10 insertions, 3 deletions
diff --git a/docs/smbdotconf/locking/strictlocking.xml b/docs/smbdotconf/locking/strictlocking.xml
index 0394e24b28..4aa337cc93 100644
--- a/docs/smbdotconf/locking/strictlocking.xml
+++ b/docs/smbdotconf/locking/strictlocking.xml
@@ -1,22 +1,29 @@
<samba:parameter name="strict locking"
context="S"
- type="boolean"
+ type="enum"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
- This is a boolean that controls the handling of file locking in the server. When this is set to <constant>yes</constant>,
+ This is an enumberated type that controls the handling of file locking in the server. When this is set to <constant>yes</constant>,
the server will check every read and write access for file locks, and deny access if locks exist. This can be slow on
some systems.
</para>
<para>
+ When strict locking is set to Auto (the default), the server performs file lock checks only on non-oplocked files.
+ As most Windows redirectors perform file locking checks locally on oplocked files this is a good trade off for
+ inproved performance.
+ </para>
+
+ <para>
When strict locking is disabled, the server performs file lock checks only when the client explicitly asks for them.
</para>
<para>
Well-behaved clients always ask for lock checks when it is important. So in the vast majority of cases,
+ <command moreinfo="none">strict locking = Auto</command> or
<command moreinfo="none">strict locking = no</command> is acceptable.
</para>
</description>
-<value type="default">yes</value>
+<value type="default">Auto</value>
</samba:parameter>