[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  3d1b6ddcd0a docs: Add caution against extending this list
       via  1054318827d docs: Remove defaults test exception for "mit kdc command"
       via  94645056203 docs: Ensure "use mmap" always has the correct default
      from  5f957449245 vfs_glusterfs: Enable caching of selinux xattr by default

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3d1b6ddcd0a1cee2eaeed5cc8bb38a8e8cdc1891
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Jun 17 09:25:17 2020 +1200

    docs: Add caution against extending this list
    
    We want correct documentation if at all possible.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Jun 17 15:48:06 UTC 2020 on sn-devel-184

commit 1054318827d0f043dcbebc394479b05d7ef8e87b
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Jun 17 08:42:08 2020 +1200

    docs: Remove defaults test exception for "mit kdc command"
    
    This ensures the documentation matches the code.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 946450562032f42712b016b6143458f46bbc3ec7
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Jun 17 09:21:56 2020 +1200

    docs: Ensure "use mmap" always has the correct default
    
    We clarify the smb.conf manpage entry for "use mmap" to match the actual behaviour
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/tuning/usemmap.xml | 6 +++---
 docs-xml/wscript_build                 | 5 +++--
 python/samba/tests/docs.py             | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/tuning/usemmap.xml b/docs-xml/smbdotconf/tuning/usemmap.xml
index 00c36c72877..9a02501fad9 100644
--- a/docs-xml/smbdotconf/tuning/usemmap.xml
+++ b/docs-xml/smbdotconf/tuning/usemmap.xml
@@ -5,9 +5,9 @@
 <description>
     <para>This global parameter determines if the tdb internals of Samba can
     depend on mmap working correctly on the running system. Samba requires a coherent
-    mmap/read-write system memory cache. Currently only HPUX does not have such a
-    coherent cache, and so this parameter is set to <constant>no</constant> by
-    default on HPUX. On all other systems this parameter should be left alone. This
+    mmap/read-write system memory cache. Currently only OpenBSD and HPUX do not have such a
+    coherent cache, and on those platforms this paramter is overridden internally
+    to be effeceively <constant>no</constant>. On all systems this parameter should be left alone. This
     parameter is provided to help the Samba developers track down problems with
     the tdb internal code.
     </para>
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 9f87e86272b..c7684088989 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -119,8 +119,9 @@ def smbdotconf_generate_parameter_list(task):
 
     entities = bld.pathconfig_entities()
 
-    # We need this if we build with Heimdal
-    mit_kdc_path = '"/usr/sbin/krb5kdc"'
+    # We need this if we build with Heimdal as we can't easily make
+    # the whole option go away
+    mit_kdc_path = '""'
     # The MIT krb5kdc path is set if we build with MIT Kerberos
     if bld.CONFIG_SET('MIT_KDC_PATH'):
         mit_kdc_path = bld.CONFIG_GET('MIT_KDC_PATH')
diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py
index 32a16a98fbc..4b67bc2bd38 100644
--- a/python/samba/tests/docs.py
+++ b/python/samba/tests/docs.py
@@ -100,6 +100,9 @@ def get_documented_tuples(sourcedir, omit_no_default=True):
 class SmbDotConfTests(TestCase):
 
     # defines the cases where the defaults may differ from the documentation
+    #
+    # Please pass the default via waf rather than adding to this
+    # list if at all possible.
     special_cases = set([
         'log level',
         'path',
@@ -109,7 +112,6 @@ class SmbDotConfTests(TestCase):
         'server string',
         'netbios name',
         'socket options',
-        'use mmap',
         'ctdbd socket',
         'printing',
         'printcap name',
@@ -123,7 +125,6 @@ class SmbDotConfTests(TestCase):
         'template homedir',
         'max open files',
         'include system krb5 conf',
-        'mit kdc command',
         'smbd max async dosmode',
     ])
 


-- 
Samba Shared Repository