[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Fri Nov 6 20:20:02 UTC 2020


The branch, master has been updated
       via  710196f0cc5 doc: improve --with-shared-modules documentation
       via  7b479c31983 build: put quotes around '!vfs_snapper' module instructions
      from  604153525af Remove source4/scripting/devel/createtrust script

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


- Log -----------------------------------------------------------------
commit 710196f0cc5ac4f9a5f9b0d2fc11376f21207743
Author: David Disseldorp <ddiss at samba.org>
Date:   Fri Nov 6 14:06:32 2020 +0100

    doc: improve --with-shared-modules documentation
    
    Remove statement about lack of support. Add description and example for
    how to explicitly disable modules via a '!' prefix.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Nov  6 20:19:22 UTC 2020 on sn-devel-184

commit 7b479c31983ad819c758176f1824a012095b03a4
Author: David Disseldorp <ddiss at samba.org>
Date:   Fri Nov 6 14:04:19 2020 +0100

    build: put quotes around '!vfs_snapper' module instructions
    
    Otherwise the exclamation may get swallowed by shell, leading to further
    confusion.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 docs-xml/Samba-Developers-Guide/packagers.xml | 7 ++++---
 source3/wscript                               | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba-Developers-Guide/packagers.xml b/docs-xml/Samba-Developers-Guide/packagers.xml
index 16248bfe906..292b602810a 100644
--- a/docs-xml/Samba-Developers-Guide/packagers.xml
+++ b/docs-xml/Samba-Developers-Guide/packagers.xml
@@ -36,9 +36,10 @@ depending on ldap or mysql. To build as much parts of samba as a plugin, run:
 </para>
 
 <para>
-The option <literal>--with-shared-modules</literal> is maintained to support specific modules such as
-idmap_XXX and vfs_XXX. For example, <literal>--with-shared-modules=idmap_ad</literal>. Use of this parameter
-to the <command>configure</command> command as not been supported in official releases.
+The configure option <literal>--with-shared-modules</literal> is provided to
+enable or disable specific modules such as idmap_XXX and vfs_XXX. For example,
+<literal>--with-shared-modules=idmap_ad</literal>. Disabled modules are
+prefixed with a '!'. E.g. <literal>--with-shared-modules='!idmap_ad'</literal>.
 </para>
 
 <para>
diff --git a/source3/wscript b/source3/wscript
index 8829ce880cd..bbd53358359 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -2142,7 +2142,7 @@ main() {
                  and conf.CHECK_HEADERS('dbus/dbus.h', lib='dbus-1')
                  and conf.CHECK_LIB('dbus-1', shlib=True))):
         conf.fatal("vfs_snapper is enabled but prerequisite dbus-1 package not "
-                   "found. Use --with-shared-modules=!vfs_snapper to disable "
+                   "found. Use --with-shared-modules='!vfs_snapper' to disable "
                    "vfs_snapper support.")
 
     conf.SAMBA_CONFIG_H('include/config.h')


-- 
Samba Shared Repository



More information about the samba-cvs mailing list