Attachment 222559 Details for Bug 252164 – Testing diff for updating net/samba413 to 4.3.14

[patch] Testing diff for updating net/samba413 to 4.3.14

samba413_4.13.4-Update.diff (text/plain), 127.41 KB, created by Harald Schmalzbauer on 2021-02-18 19:41:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Schmalzbauer

Created: 2021-02-18 19:41:56 UTC

Size: 127.41 KB

patch

obsolete

>Index: samba413/Makefile
>===================================================================
>--- samba413/Makefile	(revision 565315)
>+++ samba413/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=			${SAMBA4_BASENAME}413
> PORTVERSION=			${SAMBA4_VERSION}
>-PORTREVISION=			2
>+#PORTREVISION=			2
> CATEGORIES?=			net
> MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
> DISTNAME=			${SAMBA4_DISTNAME}
>@@ -23,7 +23,7 @@
> 
> SAMBA4_BASENAME=		samba
> SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
>-SAMBA4_VERSION=			4.13.1
>+SAMBA4_VERSION=			4.13.4
> SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
> 
> WRKSRC?=			${WRKDIR}/${DISTNAME}
>@@ -142,6 +142,8 @@
> # Readline(sponsored by Python)
> # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency
> LIB_DEPENDS+=			libreadline.so:devel/readline
>+# ICU by cifsdd
>+LIB_DEPENDS+=                   libicui18n.so:devel/icu
> # popt
> LIB_DEPENDS+=			libpopt.so:devel/popt
> # inotify
>@@ -330,6 +332,8 @@
> 
> CUPS_CONFIGURE_ENABLE=		cups iprint
> CUPS_LIB_DEPENDS=		libcups.so:print/cups
>+CUPS_PLIST_FILES+=         libexec/samba/smbspool_krb5_wrapper \
>+				man/man8/smbspool_krb5_wrapper.8.gz
> # https://bugzilla.samba.org/show_bug.cgi?id=9545
> FAM_USES=			fam
> FAM_CONFIGURE_WITH=		fam
>Index: samba413/distinfo
>===================================================================
>--- samba413/distinfo	(revision 565315)
>+++ samba413/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1604112152
>-SHA256 (samba-4.13.1.tar.gz) = 2458213b5e9abd5060228909bbe7f28fbb3ab344a7bdf34c9d0fd1566501285f
>-SIZE (samba-4.13.1.tar.gz) = 18413369
>+TIMESTAMP = 1613406726
>+SHA256 (samba-4.13.4.tar.gz) = a1b34c63f7100cc8626902d80f335c7cb0b45d4707dd3c4b010f7a28ed615c78
>+SIZE (samba-4.13.4.tar.gz) = 18429050
>Index: samba413/files/0001-Zfs-provision-1.patch
>===================================================================
>--- samba413/files/0001-Zfs-provision-1.patch	(revision 565315)
>+++ samba413/files/0001-Zfs-provision-1.patch	(working copy)
>@@ -1,32 +1,6 @@
>-From 2664c997587416a2c8c911a75158485a5c98b70b Mon Sep 17 00:00:00 2001
>-From: John Hixon <john@ixsystems.com>
>-Date: Sat, 20 May 2017 04:39:37 +0200
>-Subject: [PATCH] Zfs provision (#1)
>-
>-Cherry-pick ZFS provisioning code by iXsystems Inc.
>-
>-* Check if sysvol is on filesystem with NFSv4 ACL's
>-(cherry picked from commit ca86f52b78a7b6e7537454a69cf93e7b96210cba)
>-
>-* Only check targetdir if it is defined (I had assumed it was)
>-(cherry picked from commit a29050cb2978ce23e3c04a859340dc2664c77a8a)
>-
>-* Kick samba a little bit into understanding NFSv4 ACL's
>-(cherry picked from commit 1c7542ff4904b729e311e17464ee76582760c219)
>-
>-Signed-off-by: Timur I. Bakeyev <timur@iXsystems.com>
>----
>- python/samba/provision/__init__.py |  25 ++++--
>- source3/lib/sysacls.c              |  10 +++
>- source3/param/loadparm.c           |   7 ++
>- source3/smbd/pysmbd.c              | 156 ++++++++++++++++++++++++++++++++++++-
>- 4 files changed, 191 insertions(+), 7 deletions(-)
>-
>-diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
>-index 5de986463a5..cd3b91f41b9 100644
>---- a/python/samba/provision/__init__.py
>-+++ b/python/samba/provision/__init__.py
>-@@ -1695,19 +1695,25 @@ def setsysvolacl(samdb, netlogon, sysvol, uid, gid, do
>+--- a/python/samba/provision/__init__.py.orig	2020-07-09 09:33:56.000000000 +0000
>++++ b/python/samba/provision/__init__.py	2021-02-15 18:11:22.357104000 +0000
>+@@ -1679,19 +1679,25 @@
>          s3conf = s3param.get_context()
>          s3conf.load(lp.configfile)
>  
>@@ -57,7 +31,7 @@
>                                          "Try the mounting the filesystem with the 'acl' option.")
>              try:
>                  smbd.chown(file.name, uid, gid, system_session_unix())
>-@@ -1984,6 +1990,9 @@ def provision_fill(samdb, secrets_ldb, logger, names, 
>+@@ -1973,6 +1979,9 @@
>          samdb.transaction_commit()
>  
>      if serverrole == "active directory domain controller":
>@@ -67,7 +41,7 @@
>          # Continue setting up sysvol for GPO. This appears to require being
>          # outside a transaction.
>          if not skip_sysvolacl:
>-@@ -2340,6 +2349,9 @@ def provision(logger, session_info, smbconf=None,
>+@@ -2328,6 +2337,9 @@
>  
>              if not os.path.isdir(paths.netlogon):
>                  os.makedirs(paths.netlogon, 0o755)
>@@ -77,10 +51,8 @@
>  
>          if adminpass is None:
>              adminpass = samba.generate_random_password(12, 32)
>-diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
>-index 0bf3c37edfa..786cd39b5bc 100644
>---- a/source3/lib/sysacls.c
>-+++ b/source3/lib/sysacls.c
>+--- a/source3/lib/sysacls.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ b/source3/lib/sysacls.c	2021-02-15 18:11:22.358348000 +0000
> @@ -38,6 +38,16 @@
>  #include "modules/vfs_hpuxacl.h"
>  #endif
>@@ -98,11 +70,9 @@
>  #undef  DBGC_CLASS
>  #define DBGC_CLASS DBGC_ACLS
>  
>-diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
>-index a2fcc4246c9..4b676897fc1 100644
>---- a/source3/param/loadparm.c
>-+++ b/source3/param/loadparm.c
>-@@ -2801,9 +2801,29 @@ static void init_locals(void)
>+--- a/source3/param/loadparm.c.orig	2020-12-15 07:53:45.000000000 +0000
>++++ b/source3/param/loadparm.c	2021-02-15 18:11:22.359533000 +0000
>+@@ -2802,9 +2802,29 @@
>  		} else {
>  			if (lp_parm_const_string(-1, "xattr_tdb", "file", NULL)) {
>  				lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr xattr_tdb");
>@@ -132,11 +102,9 @@
>  				lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr");
>  			}
>  		}
>-diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
>-index 63fc5d68c33..f5a536ee186 100644
>---- a/source3/smbd/pysmbd.c
>-+++ b/source3/smbd/pysmbd.c
>-@@ -419,6 +419,20 @@ static SMB_ACL_T make_simple_acl(TALLOC_CTX *mem_ctx,
>+--- a/source3/smbd/pysmbd.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ b/source3/smbd/pysmbd.c	2021-02-15 18:11:22.360393000 +0000
>+@@ -449,6 +449,20 @@
>  	return acl;
>  }
>  
>@@ -157,7 +125,7 @@
>  /*
>    set a simple ACL on a file, as a test
>   */
>-@@ -491,7 +505,85 @@ static PyObject *py_smbd_set_simple_acl(PyObject *self
>+@@ -521,7 +535,85 @@
>  	Py_RETURN_NONE;
>  }
>  
>@@ -243,7 +211,7 @@
>    chown a file
>   */
>  static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs)
>-@@ -665,7 +757,7 @@ static PyObject *py_smbd_unlink(PyObject *self, PyObje
>+@@ -695,7 +787,7 @@
>  }
>  
>  /*
>@@ -252,7 +220,7 @@
>   */
>  static PyObject *py_smbd_have_posix_acls(PyObject *self,
>  		PyObject *Py_UNUSED(ignored))
>-@@ -677,7 +769,84 @@ static PyObject *py_smbd_have_posix_acls(PyObject *sel
>+@@ -707,7 +799,84 @@
>  #endif
>  }
>  
>@@ -337,7 +305,7 @@
>    set the NT ACL on a file
>   */
>  static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kwargs)
>-@@ -1124,8 +1296,26 @@ static PyMethodDef py_smbd_methods[] = {
>+@@ -1155,8 +1324,26 @@
>  	{ "have_posix_acls",
>  		(PyCFunction)py_smbd_have_posix_acls, METH_NOARGS,
>  		NULL },
>@@ -364,6 +332,3 @@
>  		METH_VARARGS|METH_KEYWORDS,
>  		NULL },
>  	{ "set_nt_acl",
>--- 
>-2.14.2
>-
>Index: samba413/files/patch-buildtools_scripts_abi__gen.sh
>===================================================================
>--- samba413/files/patch-buildtools_scripts_abi__gen.sh	(revision 565315)
>+++ samba413/files/patch-buildtools_scripts_abi__gen.sh	(working copy)
>@@ -1,6 +1,6 @@
>---- buildtools/scripts/abi_gen.sh.orig	2019-01-15 10:07:00 UTC
>-+++ buildtools/scripts/abi_gen.sh
>-@@ -9,13 +9,14 @@ GDBSCRIPT="gdb_syms.$$"
>+--- buildtools/scripts/abi_gen.sh.orig	2020-07-09 09:33:55.000000000 +0000
>++++ buildtools/scripts/abi_gen.sh	2021-02-15 16:50:13.531035000 +0000
>+@@ -9,13 +9,14 @@
>  cat <<EOF
>  set height 0
>  set width 0
>@@ -16,6 +16,6 @@
>  ) > $GDBSCRIPT
>  
>  # forcing the terminal avoids a problem on Fedora12
>--TERM=none gdb -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null
>+-TERM=none gdb -n -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null
> +TERM=none %%GDB_CMD%% -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null | sed -e 's/:type =/:/g'
>  rm -f $GDBSCRIPT
>Index: samba413/files/patch-buildtools_wafsamba_samba__autoconf.py
>===================================================================
>--- samba413/files/patch-buildtools_wafsamba_samba__autoconf.py	(revision 565315)
>+++ samba413/files/patch-buildtools_wafsamba_samba__autoconf.py	(working copy)
>@@ -1,6 +1,6 @@
>---- buildtools/wafsamba/samba_autoconf.py.orig	2019-08-20 15:35:08 UTC
>-+++ buildtools/wafsamba/samba_autoconf.py
>-@@ -573,7 +573,7 @@ def library_flags(self, libs):
>+--- buildtools/wafsamba/samba_autoconf.py.orig	2020-07-09 09:33:55.000000000 +0000
>++++ buildtools/wafsamba/samba_autoconf.py	2021-02-15 16:51:53.344711000 +0000
>+@@ -574,7 +574,7 @@
>  
>  
>  @conf
>@@ -9,7 +9,7 @@
>      '''check if a set of libraries exist as system libraries
>  
>      returns the sublist of libs that do exist as a syslib or []
>-@@ -593,11 +593,14 @@ int foo()
>+@@ -594,11 +594,14 @@
>              ret.append(lib)
>              continue
>  
>@@ -26,7 +26,7 @@
>  
>          if not res:
>              if mandatory:
>-@@ -949,5 +952,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
>+@@ -962,5 +965,5 @@
>          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
>  
>          if (conf.env.undefined_ignore_ldflags == [] and
>Index: samba413/files/patch-buildtools_wafsamba_samba__install.py
>===================================================================
>--- samba413/files/patch-buildtools_wafsamba_samba__install.py	(revision 565315)
>+++ samba413/files/patch-buildtools_wafsamba_samba__install.py	(working copy)
>@@ -1,6 +1,6 @@
>---- buildtools/wafsamba/samba_install.py.orig	2019-01-15 10:07:00 UTC
>-+++ buildtools/wafsamba/samba_install.py
>-@@ -118,7 +118,7 @@ def install_library(self):
>+--- buildtools/wafsamba/samba_install.py.orig	2020-07-09 09:33:55.000000000 +0000
>++++ buildtools/wafsamba/samba_install.py	2021-02-15 16:53:07.652758000 +0000
>+@@ -115,7 +115,7 @@
>                  inst_name    = bld.make_libname(t.target)
>          elif self.vnum:
>              vnum_base    = self.vnum.split('.')[0]
>@@ -8,4 +8,4 @@
> +            install_name = bld.make_libname(target_name, version=vnum_base)
>              install_link = bld.make_libname(target_name, version=vnum_base)
>              inst_name    = bld.make_libname(t.target)
>-             if not self.private_library:
>+             if not self.private_library or not t.env.SONAME_ST:
>Index: samba413/files/patch-buildtools_wafsamba_wafsamba.py
>===================================================================
>--- samba413/files/patch-buildtools_wafsamba_wafsamba.py	(revision 565315)
>+++ samba413/files/patch-buildtools_wafsamba_wafsamba.py	(working copy)
>@@ -1,6 +1,6 @@
>---- ./buildtools/wafsamba/wafsamba.py.orig	2015-07-21 09:47:48 UTC
>-+++ ./buildtools/wafsamba/wafsamba.py
>-@@ -919,7 +919,7 @@ def SAMBAMANPAGES(bld, manpages, extra_s
>+--- ./buildtools/wafsamba/wafsamba.py.orig	2020-11-03 12:33:19.000000000 +0000
>++++ ./buildtools/wafsamba/wafsamba.py	2021-02-15 16:54:37.839071000 +0000
>+@@ -942,7 +942,7 @@
>      bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
>      bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
>      bld.env.SAMBA_CATALOG = bld.bldnode.abspath() + '/docs-xml/build/catalog.xml'
>Index: samba413/files/patch-buildtools_wafsamba_wscript
>===================================================================
>--- samba413/files/patch-buildtools_wafsamba_wscript	(revision 565315)
>+++ samba413/files/patch-buildtools_wafsamba_wscript	(working copy)
>@@ -1,6 +1,6 @@
>---- buildtools/wafsamba/wscript.orig	2019-01-15 10:07:00 UTC
>-+++ buildtools/wafsamba/wscript
>-@@ -80,12 +80,17 @@ def options(opt):
>+--- buildtools/wafsamba/wscript.orig	2020-07-09 09:33:55.000000000 +0000
>++++ buildtools/wafsamba/wscript	2021-02-15 16:55:47.512487000 +0000
>+@@ -80,12 +80,17 @@
>                     help=("private library directory [PREFIX/lib/%s]" % Context.g_module.APPNAME),
>                     action="store", dest='PRIVATELIBDIR', default=None)
>  
>Index: samba413/files/patch-ctdb_wscript
>===================================================================
>--- samba413/files/patch-ctdb_wscript	(revision 565315)
>+++ samba413/files/patch-ctdb_wscript	(working copy)
>@@ -1,6 +1,6 @@
>---- ctdb/wscript.orig	2020-01-31 10:25:36 UTC
>-+++ ctdb/wscript
>-@@ -104,6 +104,9 @@ def options(opt):
>+--- ctdb/wscript.orig	2020-07-09 09:33:56.000000000 +0000
>++++ ctdb/wscript	2021-02-15 16:56:45.856949000 +0000
>+@@ -106,6 +106,9 @@
>      opt.add_option('--enable-ceph-reclock',
>                     help=("Enable Ceph CTDB recovery lock helper (default=no)"),
>                     action="store_true", dest='ctdb_ceph_reclock', default=False)
>@@ -10,7 +10,7 @@
>  
>      opt.add_option('--with-logdir',
>                     help=("Path to log directory"),
>-@@ -261,7 +264,7 @@ def configure(conf):
>+@@ -267,7 +270,7 @@
>  
>      if Options.options.ctdb_ceph_reclock:
>          if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and
>@@ -19,7 +19,7 @@
>              Logs.info('Building with Ceph librados recovery lock support')
>              conf.define('HAVE_LIBRADOS', 1)
>          else:
>-@@ -300,9 +303,15 @@ def configure(conf):
>+@@ -306,9 +309,15 @@
>                      conf.env.CTDB_VARDIR,
>                      conf.env.CTDB_RUNDIR))
>  
>@@ -37,7 +37,7 @@
>      # Allow unified compilation and separate compilation of utilities
>      # to find includes
>      if not conf.env.standalone_ctdb:
>-@@ -681,9 +690,9 @@ def build(bld):
>+@@ -689,9 +698,9 @@
>      if bld.env.HAVE_LIBRADOS:
>          bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper',
>                           source='utils/ceph/ctdb_mutex_ceph_rados_helper.c',
>@@ -50,7 +50,7 @@
>  
>      sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g'  % (bld.env.CTDB_VARDIR)
>      sed_expr2 = 's|/usr/local/etc/ctdb|%s|g'      % (bld.env.CTDB_ETCDIR)
>-@@ -859,6 +868,9 @@ def build(bld):
>+@@ -867,6 +876,9 @@
>  
>      for d in ['volatile', 'persistent', 'state']:
>          bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))
>Index: samba413/files/patch-dwrap
>===================================================================
>--- samba413/files/patch-dwrap	(revision 565315)
>+++ samba413/files/patch-dwrap	(working copy)
>@@ -1,5 +1,5 @@
>---- lib/dbwrap/dbwrap.c.orig	2019-01-15 10:07:00 UTC
>-+++ lib/dbwrap/dbwrap.c
>+--- lib/dbwrap/dbwrap.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ lib/dbwrap/dbwrap.c	2021-02-15 16:58:57.730147000 +0000
> @@ -28,6 +28,9 @@
>  #include "lib/util/util_tdb.h"
>  #include "lib/util/tevent_ntstatus.h"
>@@ -10,8 +10,8 @@
>  /*
>   * Fall back using fetch if no genuine exists operation is provided
>   */
>---- lib/dbwrap/dbwrap_local_open.c.orig	2019-01-15 10:07:00 UTC
>-+++ lib/dbwrap/dbwrap_local_open.c
>+--- lib/dbwrap/dbwrap_local_open.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ lib/dbwrap/dbwrap_local_open.c	2021-02-15 16:58:57.731931000 +0000
> @@ -23,6 +23,9 @@
>  #include "dbwrap/dbwrap_tdb.h"
>  #include "tdb.h"
>@@ -22,8 +22,8 @@
>  struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx,
>  				     const char *name,
>  				     int hash_size, int tdb_flags,
>---- lib/dbwrap/dbwrap_rbt.c.orig	2019-01-15 10:07:00 UTC
>-+++ lib/dbwrap/dbwrap_rbt.c
>+--- lib/dbwrap/dbwrap_rbt.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ lib/dbwrap/dbwrap_rbt.c	2021-02-15 16:58:57.732765000 +0000
> @@ -24,6 +24,9 @@
>  #include "../lib/util/rbtree.h"
>  #include "../lib/util/dlinklist.h"
>@@ -34,9 +34,9 @@
>  #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)
>  
>  struct db_rbt_ctx {
>---- lib/dbwrap/dbwrap_tdb.c.orig	2019-01-15 10:07:00 UTC
>-+++ lib/dbwrap/dbwrap_tdb.c
>-@@ -27,6 +27,9 @@
>+--- lib/dbwrap/dbwrap_tdb.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ lib/dbwrap/dbwrap_tdb.c	2021-02-15 16:58:57.733546000 +0000
>+@@ -29,6 +29,9 @@
>  #include "lib/param/param.h"
>  #include "libcli/util/error.h"
>  
>@@ -46,8 +46,8 @@
>  struct db_tdb_ctx {
>  	struct tdb_wrap *wtdb;
>  
>---- lib/dbwrap/dbwrap_util.c.orig	2019-01-15 10:07:00 UTC
>-+++ lib/dbwrap/dbwrap_util.c
>+--- lib/dbwrap/dbwrap_util.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ lib/dbwrap/dbwrap_util.c	2021-02-15 16:58:57.734376000 +0000
> @@ -26,6 +26,9 @@
>  #include "dbwrap.h"
>  #include "lib/util/util_tdb.h"
>@@ -58,8 +58,8 @@
>  struct dbwrap_fetch_int32_state {
>  	NTSTATUS status;
>  	int32_t result;
>---- source3/lib/dbwrap/dbwrap_ctdb.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/lib/dbwrap/dbwrap_ctdb.c
>+--- source3/lib/dbwrap/dbwrap_ctdb.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/lib/dbwrap/dbwrap_ctdb.c	2021-02-15 16:58:57.735408000 +0000
> @@ -38,6 +38,9 @@
>  #include "lib/cluster_support.h"
>  #include "lib/util/tevent_ntstatus.h"
>@@ -70,8 +70,8 @@
>  struct db_ctdb_transaction_handle {
>  	struct db_ctdb_ctx *ctx;
>  	/*
>---- source3/lib/dbwrap/dbwrap_open.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/lib/dbwrap/dbwrap_open.c
>+--- source3/lib/dbwrap/dbwrap_open.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/lib/dbwrap/dbwrap_open.c	2021-02-15 16:58:57.736524000 +0000
> @@ -31,6 +31,9 @@
>  #include "ctdbd_conn.h"
>  #include "messages.h"
>@@ -82,8 +82,8 @@
>  bool db_is_local(const char *name)
>  {
>  	const char *sockname = lp_ctdbd_socket();
>---- source3/lib/dbwrap/dbwrap_watch.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/lib/dbwrap/dbwrap_watch.c
>+--- source3/lib/dbwrap/dbwrap_watch.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/lib/dbwrap/dbwrap_watch.c	2021-02-15 16:58:57.737420000 +0000
> @@ -28,6 +28,9 @@
>  #include "server_id_watch.h"
>  #include "lib/dbwrap/dbwrap_private.h"
>Index: samba413/files/patch-dynconfig_wscript
>===================================================================
>--- samba413/files/patch-dynconfig_wscript	(revision 565315)
>+++ samba413/files/patch-dynconfig_wscript	(working copy)
>@@ -1,6 +1,6 @@
>---- dynconfig/wscript.orig	2019-01-15 10:07:00 UTC
>-+++ dynconfig/wscript
>-@@ -141,6 +141,8 @@ dynconfig = {
>+--- dynconfig/wscript.orig	2020-07-09 09:33:56.000000000 +0000
>++++ dynconfig/wscript	2021-02-15 17:01:01.953514000 +0000
>+@@ -146,6 +146,8 @@
>      'PKGCONFIGDIR' : {
>           'STD-PATH':  '${LIBDIR}/pkgconfig',
>           'FHS-PATH':  '${LIBDIR}/pkgconfig',
>@@ -9,7 +9,7 @@
>      },
>      'CODEPAGEDIR' : {
>           'STD-PATH':  '${DATADIR}/codepages',
>-@@ -247,8 +249,8 @@ dynconfig = {
>+@@ -252,8 +254,8 @@
>           'DELAY':     True,
>      },
>      'CONFIGFILE' : {
>@@ -20,7 +20,7 @@
>           'DELAY':     True,
>      },
>      'LMHOSTSFILE' : {
>-@@ -307,9 +309,6 @@ def configure(conf):
>+@@ -312,9 +314,6 @@
>          flavor = 'FHS-PATH'
>      else:
>          flavor = 'STD-PATH'
>Index: samba413/files/patch-lib_ldb_ldb__key__value_ldb__kv__cache.c
>===================================================================
>--- samba413/files/patch-lib_ldb_ldb__key__value_ldb__kv__cache.c	(revision 565315)
>+++ samba413/files/patch-lib_ldb_ldb__key__value_ldb__kv__cache.c	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/ldb/ldb_key_value/ldb_kv_cache.c.orig	2019-01-15 10:07:00 UTC
>-+++ lib/ldb/ldb_key_value/ldb_kv_cache.c
>-@@ -90,7 +90,9 @@ static int ldb_schema_attribute_compare(
>+--- lib/ldb/ldb_key_value/ldb_kv_cache.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ lib/ldb/ldb_key_value/ldb_kv_cache.c	2021-02-15 17:02:58.718750000 +0000
>+@@ -92,7 +92,9 @@
>  {
>  	const struct ldb_schema_attribute *sa1 = (const struct ldb_schema_attribute *)p1;
>  	const struct ldb_schema_attribute *sa2 = (const struct ldb_schema_attribute *)p2;
>Index: samba413/files/patch-lib_ldb_wscript
>===================================================================
>--- samba413/files/patch-lib_ldb_wscript	(revision 565315)
>+++ samba413/files/patch-lib_ldb_wscript	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/ldb/wscript.orig	2019-07-08 12:47:51 UTC
>-+++ lib/ldb/wscript
>-@@ -207,7 +207,7 @@ def build(bld):
>+--- lib/ldb/wscript.orig	2020-07-09 09:33:56.000000000 +0000
>++++ lib/ldb/wscript	2021-02-15 17:04:10.779580000 +0000
>+@@ -207,7 +207,7 @@
>      if bld.env.standalone_ldb:
>          if not 'PACKAGE_VERSION' in bld.env:
>              bld.env.PACKAGE_VERSION = VERSION
>@@ -9,7 +9,7 @@
>          private_library = False
>      else:
>          private_library = True
>-@@ -284,7 +284,6 @@ def build(bld):
>+@@ -284,7 +284,6 @@
>                            pc_files='ldb.pc',
>                            vnum=VERSION,
>                            private_library=private_library,
>@@ -17,7 +17,7 @@
>                            abi_directory='ABI',
>                            abi_match = abi_match)
>  
>-@@ -437,7 +436,7 @@ def build(bld):
>+@@ -437,7 +436,7 @@
>  
>          LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
>          for t in LDB_TOOLS.split():
>@@ -26,7 +26,7 @@
>                               manpages='man/%s.1' % t)
>  
>          # ldbtest doesn't get installed
>-@@ -449,10 +448,10 @@ def build(bld):
>+@@ -449,10 +448,10 @@
>          else:
>              lmdb_deps = ''
>          # ldbdump doesn't get installed
>@@ -39,7 +39,7 @@
>  
>          bld.SAMBA_LIBRARY('ldb-cmdline',
>                            source='tools/ldbutil.c tools/cmdline.c',
>-@@ -497,11 +496,6 @@ def build(bld):
>+@@ -497,11 +496,6 @@
>                           deps='cmocka ldb',
>                           install=False)
>  
>@@ -51,7 +51,7 @@
>          bld.SAMBA_BINARY('ldb_key_value_test',
>                           source='tests/ldb_key_value_test.c',
>                           deps='cmocka ldb ldb_tdb_err_map',
>-@@ -609,7 +603,6 @@ def test(ctx):
>+@@ -628,7 +622,6 @@
>                   'ldb_msg_test',
>                   'ldb_tdb_kv_ops_test',
>                   'ldb_tdb_test',
>Index: samba413/files/patch-lib_replace_wscript
>===================================================================
>--- samba413/files/patch-lib_replace_wscript	(revision 565315)
>+++ samba413/files/patch-lib_replace_wscript	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/replace/wscript.orig	2019-01-15 10:07:00 UTC
>-+++ lib/replace/wscript
>-@@ -119,7 +119,7 @@ def configure(conf):
>+--- lib/replace/wscript.orig	2020-09-15 13:43:18.000000000 +0000
>++++ lib/replace/wscript	2021-02-15 17:05:05.690530000 +0000
>+@@ -130,7 +130,7 @@
>      conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
>      conf.CHECK_HEADERS('libgen.h')
>  
>Index: samba413/files/patch-lib_talloc_talloc.c
>===================================================================
>--- samba413/files/patch-lib_talloc_talloc.c	(revision 565315)
>+++ samba413/files/patch-lib_talloc_talloc.c	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/talloc/talloc.c.orig	2019-01-15 10:07:00 UTC
>-+++ lib/talloc/talloc.c
>-@@ -391,6 +391,9 @@ void talloc_lib_init(void) __attribute__
>+--- lib/talloc/talloc.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ lib/talloc/talloc.c	2021-02-15 17:05:50.559749000 +0000
>+@@ -396,6 +396,9 @@
>  void talloc_lib_init(void)
>  {
>  	uint32_t random_value;
>@@ -10,7 +10,7 @@
>  #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM)
>  	uint8_t *p;
>  	/*
>-@@ -424,6 +427,7 @@ void talloc_lib_init(void)
>+@@ -429,6 +432,7 @@
>  		 */
>  		random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF);
>  	}
>Index: samba413/files/patch-lib_util_wscript__build
>===================================================================
>--- samba413/files/patch-lib_util_wscript__build	(revision 565315)
>+++ samba413/files/patch-lib_util_wscript__build	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/util/wscript_build.orig	2019-05-07 08:38:21 UTC
>-+++ lib/util/wscript_build
>-@@ -151,7 +151,7 @@ else:
>+--- lib/util/wscript_build.orig	2020-08-28 09:32:54.000000000 +0000
>++++ lib/util/wscript_build	2021-02-15 17:07:57.270651000 +0000
>+@@ -176,7 +176,7 @@
>  
>      bld.SAMBA_LIBRARY('samba-modules',
>                        source='modules.c',
>Index: samba413/files/patch-listen-backlog
>===================================================================
>--- samba413/files/patch-listen-backlog	(revision 565315)
>+++ samba413/files/patch-listen-backlog	(working copy)
>@@ -1,6 +1,6 @@
>---- lib/tevent/echo_server.c.orig	2019-01-15 10:07:00 UTC
>-+++ lib/tevent/echo_server.c
>-@@ -633,7 +633,7 @@ int main(int argc, const char **argv)
>+--- lib/tevent/echo_server.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ lib/tevent/echo_server.c	2021-02-15 17:09:02.306335000 +0000
>+@@ -633,7 +633,7 @@
>  		exit(1);
>  	}
>  
>@@ -9,9 +9,9 @@
>  	if (ret == -1) {
>  		perror("listen() failed");
>  		exit(1);
>---- source3/include/local.h.orig	2019-01-15 10:07:00 UTC
>-+++ source3/include/local.h
>-@@ -173,7 +173,18 @@
>+--- source3/include/local.h.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/include/local.h	2021-02-15 17:09:02.307597000 +0000
>+@@ -163,7 +163,18 @@
>  #define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2)
>  
>  /* size of listen() backlog in smbd */
>@@ -30,9 +30,9 @@
>  
>  /* Number of microseconds to wait before a sharing violation. */
>  #define SHARING_VIOLATION_USEC_WAIT 950000
>---- source3/libsmb/unexpected.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/libsmb/unexpected.c
>-@@ -95,7 +95,7 @@ NTSTATUS nb_packet_server_create(TALLOC_
>+--- source3/libsmb/unexpected.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/libsmb/unexpected.c	2021-02-15 17:09:02.308736000 +0000
>+@@ -95,7 +95,7 @@
>  		status = map_nt_error_from_unix(errno);
>  		goto fail;
>  	}
>@@ -41,9 +41,9 @@
>  	if (rc < 0) {
>  		status = map_nt_error_from_unix(errno);
>  		goto fail;
>---- source3/rpc_server/rpc_server.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/rpc_server/rpc_server.c
>-@@ -158,7 +158,7 @@ bool setup_named_pipe_socket(const char 
>+--- source3/rpc_server/rpc_server.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/rpc_server/rpc_server.c	2021-02-15 17:09:02.310682000 +0000
>+@@ -199,7 +199,7 @@
>  		goto out;
>  	}
>  
>@@ -50,9 +50,9 @@
> -	rc = listen(state->fd, 5);
> +	rc = listen(state->fd, DEFAULT_LISTEN_BACKLOG);
>  	if (rc < 0) {
>- 		DEBUG(0, ("Failed to listen on pipe socket %s: %s\n",
>- 			  pipe_name, strerror(errno)));
>-@@ -830,7 +830,7 @@ bool setup_dcerpc_ncalrpc_socket(struct 
>+ 		status = map_nt_error_from_unix_common(errno);
>+ 		DBG_ERR("Failed to listen on ncacn_np socket %s: %s\n",
>+@@ -605,7 +605,7 @@
>  		goto out;
>  	}
>  
>@@ -59,11 +59,11 @@
> -	rc = listen(state->fd, 5);
> +	rc = listen(state->fd, DEFAULT_LISTEN_BACKLOG);
>  	if (rc < 0) {
>- 		DEBUG(0, ("Failed to listen on ncalrpc socket %s: %s\n",
>- 			  name, strerror(errno)));
>---- source3/utils/smbfilter.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/utils/smbfilter.c
>-@@ -291,7 +291,7 @@ static void start_filter(char *desthost)
>+ 		const char *endpoint = dcerpc_binding_get_string_option(
>+ 				e->ep_description, "endpoint");
>+--- source3/utils/smbfilter.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/utils/smbfilter.c	2021-02-15 17:09:02.311835000 +0000
>+@@ -291,7 +291,7 @@
>  		exit(1);
>  	}
>  
>@@ -72,9 +72,9 @@
>  		d_printf("listen failed\n");
>  	}
>  
>---- source3/winbindd/winbindd.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/winbindd/winbindd.c
>-@@ -1317,7 +1317,7 @@ static bool winbindd_setup_listeners(voi
>+--- source3/winbindd/winbindd.c.orig	2020-11-03 12:33:19.000000000 +0000
>++++ source3/winbindd/winbindd.c	2021-02-15 17:09:02.313490000 +0000
>+@@ -1324,7 +1324,7 @@
>  	if (pub_state->fd == -1) {
>  		goto failed;
>  	}
>@@ -83,7 +83,7 @@
>  	if (rc < 0) {
>  		goto failed;
>  	}
>-@@ -1349,7 +1349,7 @@ static bool winbindd_setup_listeners(voi
>+@@ -1356,7 +1356,7 @@
>  	if (priv_state->fd == -1) {
>  		goto failed;
>  	}
>Index: samba413/files/patch-source3_include_includes.h
>===================================================================
>--- samba413/files/patch-source3_include_includes.h	(revision 565315)
>+++ samba413/files/patch-source3_include_includes.h	(working copy)
>@@ -1,6 +1,6 @@
>---- source3/include/includes.h.orig	2019-01-15 10:07:00 UTC
>-+++ source3/include/includes.h
>-@@ -322,6 +322,8 @@ typedef char fstring[FSTRING_LEN];
>+--- source3/include/includes.h.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/include/includes.h	2021-02-15 17:13:02.454877000 +0000
>+@@ -327,6 +327,8 @@
>   * the *bottom* of include files so as not to conflict. */
>  #ifdef ENABLE_DMALLOC
>  #  include <dmalloc.h>
>Index: samba413/files/patch-source3_lib_util.c
>===================================================================
>--- samba413/files/patch-source3_lib_util.c	(revision 565315)
>+++ samba413/files/patch-source3_lib_util.c	(working copy)
>@@ -1,6 +1,6 @@
>---- source3/lib/util.c.orig	2019-05-07 08:38:21 UTC
>-+++ source3/lib/util.c
>-@@ -1916,7 +1916,10 @@ bool any_nt_status_not_ok(NTSTATUS err1,
>+--- source3/lib/util.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/lib/util.c	2021-02-15 17:14:51.870464000 +0000
>+@@ -1899,7 +1899,10 @@
>  
>  int timeval_to_msec(struct timeval t)
>  {
>Index: samba413/files/patch-source3_librpc_crypto_gse.c
>===================================================================
>--- samba413/files/patch-source3_librpc_crypto_gse.c	(revision 565315)
>+++ samba413/files/patch-source3_librpc_crypto_gse.c	(working copy)
>@@ -1,6 +1,6 @@
>---- source3/librpc/crypto/gse.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/librpc/crypto/gse.c
>-@@ -621,11 +621,12 @@ static NTSTATUS gse_get_server_auth_toke
>+--- source3/librpc/crypto/gse.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/librpc/crypto/gse.c	2021-02-15 17:16:05.959103000 +0000
>+@@ -627,11 +627,12 @@
>  	struct gse_context *gse_ctx =
>  		talloc_get_type_abort(gensec_security->private_data,
>  				      struct gse_context);
>Index: samba413/files/patch-source3_modules_vfs__fruit.c
>===================================================================
>--- samba413/files/patch-source3_modules_vfs__fruit.c	(revision 565315)
>+++ samba413/files/patch-source3_modules_vfs__fruit.c	(working copy)
>@@ -12,9 +12,9 @@
> 
> Signed-off-by: Ralph Boehme <slow@samba.org>
> 
>---- source3/lib/adouble.c.orig	2020-05-08 09:30:43 UTC
>-+++ source3/lib/adouble.c
>-@@ -2662,6 +2662,8 @@ ssize_t afpinfo_pack(const AfpInfo *ai, char *buf)
>+--- source3/lib/adouble.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/lib/adouble.c	2021-02-15 17:23:56.234185000 +0000
>+@@ -2665,6 +2665,8 @@
>  	return AFP_INFO_SIZE;
>  }
>  
>@@ -23,7 +23,7 @@
>  /**
>   * Unpack a buffer into a AfpInfo structure
>   *
>-@@ -2679,12 +2681,22 @@ AfpInfo *afpinfo_unpack(TALLOC_CTX *ctx, const void *d
>+@@ -2682,12 +2684,22 @@
>  	ai->afpi_Version = RIVAL(data, 4);
>  	ai->afpi_BackupTime = RIVAL(data, 12);
>  	memcpy(ai->afpi_FinderInfo, (const char *)data + 16,
>@@ -50,14 +50,18 @@
>  	}
>  
>  	return ai;
>---- source3/modules/vfs_fruit.c.orig	2020-05-08 09:37:56 UTC
>-+++ source3/modules/vfs_fruit.c
>-@@ -2191,9 +2191,20 @@ static ssize_t fruit_pread_meta_stream(vfs_handle_stru
>- {
>+--- source3/modules/vfs_fruit.c.orig	2021-01-26 07:16:58.000000000 +0000
>++++ source3/modules/vfs_fruit.c	2021-02-15 17:26:14.147230000 +0000
>+@@ -2146,13 +2146,24 @@
>+ 	struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
>  	ssize_t nread;
>  	int ret;
> +	char *p = (char *)data;
>  
>+ 	if (fio->fake_fd) {
>+ 		return -1;
>+ 	}
>+ 
>  	nread = SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
> -	if (nread == -1 || nread == n) {
> +
>@@ -68,7 +72,7 @@
> +	if (nread == n) {
> +		if (offset == 0 && nread > 3 && p[0] == 0 && p[1] == 'F' && p[2] == 'P') {
> +			DBG_NOTICE("Fixing AFP_Info of [%s]\n",
>-+				    fsp_str_dbg(fsp));
>++				fsp_str_dbg(fsp));
> +			p[0] = 'A';
> +		}
>  		return nread;
>Index: samba413/files/patch-source3_modules_vfs__streams__xattr.c
>===================================================================
>--- samba413/files/patch-source3_modules_vfs__streams__xattr.c	(revision 565315)
>+++ samba413/files/patch-source3_modules_vfs__streams__xattr.c	(working copy)
>@@ -1,5 +1,5 @@
>---- source3/modules/vfs_streams_xattr.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/modules/vfs_streams_xattr.c
>+--- source3/modules/vfs_streams_xattr.c.orig	2021-01-26 07:16:58.000000000 +0000
>++++ source3/modules/vfs_streams_xattr.c	2021-02-15 17:33:20.076901000 +0000
> @@ -1,10 +1,10 @@
>  /*
>   * Store streams in xattrs
>@@ -13,8 +13,8 @@
>   * Copyright (C) James Peach 2006-2007
>   *
>   * This program is free software; you can redistribute it and/or modify
>-@@ -79,25 +79,79 @@ static SMB_INO_T stream_inode(const SMB_
>- }
>+@@ -46,25 +46,79 @@
>+ };
>  
>  static ssize_t get_xattr_size(connection_struct *conn,
> -				const struct smb_filename *smb_fname,
>@@ -104,7 +104,7 @@
>  /**
>   * Given a stream name, populate xattr_name with the xattr name to use for
>   * accessing the stream.
>-@@ -114,6 +168,7 @@ static NTSTATUS streams_xattr_get_name(v
>+@@ -81,6 +135,7 @@
>  	SMB_VFS_HANDLE_GET_DATA(handle, config, struct streams_xattr_config,
>  				return NT_STATUS_UNSUCCESSFUL);
>  
>@@ -112,7 +112,7 @@
>  	sname = talloc_strdup(ctx, stream_name + 1);
>  	if (sname == NULL) {
>  		return NT_STATUS_NO_MEMORY;
>-@@ -125,7 +180,7 @@ static NTSTATUS streams_xattr_get_name(v
>+@@ -92,7 +147,7 @@
>  	 * characters from their on-the-wire Unicode Private Range
>  	 * encoding to their native ASCII representation.
>  	 *
>@@ -121,7 +121,7 @@
>  	 * vfs_streams_xattr) may contain a colon, so we have to use
>  	 * strrchr_m() instead of strchr_m() for matching the stream
>  	 * type suffix.
>-@@ -157,7 +212,7 @@ static NTSTATUS streams_xattr_get_name(v
>+@@ -124,7 +179,7 @@
>  		return NT_STATUS_NO_MEMORY;
>  	}
>  
>@@ -130,7 +130,7 @@
>  		   stream_name));
>  
>  	talloc_free(sname);
>-@@ -270,8 +325,8 @@ static int streams_xattr_fstat(vfs_handl
>+@@ -238,8 +293,8 @@
>  		return -1;
>  	}
>  
>@@ -141,7 +141,7 @@
>  	if (sbuf->st_ex_size == -1) {
>  		TALLOC_FREE(smb_fname_base);
>  		SET_STAT_INVALID(*sbuf);
>-@@ -446,10 +501,10 @@ static int streams_xattr_open(vfs_handle
>+@@ -403,10 +458,10 @@
>  		goto fail;
>  	}
>  
>@@ -155,7 +155,7 @@
>  
>  	if (!NT_STATUS_IS_OK(status)) {
>  		if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
>-@@ -480,19 +535,13 @@ static int streams_xattr_open(vfs_handle
>+@@ -437,19 +492,13 @@
>  		/*
>  		 * The attribute does not exist or needs to be truncated
>  		 */
>@@ -176,7 +176,7 @@
>  				       flags & O_EXCL ? XATTR_CREATE : 0);
>  		if (ret != 0) {
>  			goto fail;
>-@@ -678,8 +727,8 @@ static int streams_xattr_rename(vfs_hand
>+@@ -645,8 +694,8 @@
>  	}
>  
>  	/* read the old stream */
>@@ -187,7 +187,7 @@
>  	if (!NT_STATUS_IS_OK(status)) {
>  		errno = ENOENT;
>  		goto fail;
>-@@ -766,14 +815,13 @@ static NTSTATUS walk_xattr_streams(vfs_h
>+@@ -733,14 +782,13 @@
>  			continue;
>  		}
>  
>@@ -204,7 +204,7 @@
>  				names[i],
>  				smb_fname->base_name,
>  				nt_errstr(status)));
>-@@ -835,16 +883,17 @@ struct streaminfo_state {
>+@@ -802,16 +850,17 @@
>  	NTSTATUS status;
>  };
>  
>@@ -225,7 +225,7 @@
>  		state->status = NT_STATUS_NO_MEMORY;
>  		return false;
>  	}
>-@@ -964,14 +1013,17 @@ static ssize_t streams_xattr_pwrite(vfs_
>+@@ -931,14 +980,17 @@
>  				    files_struct *fsp, const void *data,
>  				    size_t n, off_t offset)
>  {
>@@ -246,7 +246,7 @@
>  
>  	if (sio == NULL) {
>  		return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
>-@@ -981,6 +1033,8 @@ static ssize_t streams_xattr_pwrite(vfs_
>+@@ -948,6 +1000,8 @@
>  		return -1;
>  	}
>  
>@@ -255,8 +255,8 @@
>  	/* Create an smb_filename with stream_name == NULL. */
>  	smb_fname_base = synthetic_smb_fname(talloc_tos(),
>  					sio->base,
>-@@ -988,39 +1042,55 @@ static ssize_t streams_xattr_pwrite(vfs_
>- 					NULL,
>+@@ -956,40 +1010,56 @@
>+ 					fsp->fsp_name->twrp,
>  					fsp->fsp_name->flags);
>  	if (smb_fname_base == NULL) {
> +		TALLOC_FREE(frame);
>@@ -266,17 +266,9 @@
>  
> -	status = get_ea_value(talloc_tos(), handle->conn, NULL,
> -			      smb_fname_base, sio->xattr_name, &ea);
>--	if (!NT_STATUS_IS_OK(status)) {
>--		return -1;
>--	}
>--
>--        if ((offset + n) > ea.value.length-1) {
>--		uint8_t *tmp;
> +	status = get_xattr_value(talloc_tos(), handle->conn,
> +				 smb_fname_base, sio->xattr_name, &ea);
>- 
>--		tmp = talloc_realloc(talloc_tos(), ea.value.data, uint8_t,
>--					   offset + n + 1);
>++
> +	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
> +		/*
> +		 * This can happen if we sit behind vfs_fruit:
>@@ -287,16 +279,7 @@
> +		 *
> +		 * This might be not the last word on this.
> +		 */
>- 
>--		if (tmp == NULL) {
>--			TALLOC_FREE(ea.value.data);
>--                        errno = ENOMEM;
>--                        return -1;
>--                }
>--		ea.value.data = tmp;
>--		ea.value.length = offset + n + 1;
>--		ea.value.data[offset+n] = 0;
>--        }
>++
> +		ea = (struct ea_struct) {0};
> +		ea.name = talloc_strdup(talloc_tos(), sio->xattr_name);
> +		if (ea.name == NULL) {
>@@ -306,12 +289,11 @@
> +		}
> +		status = NT_STATUS_OK;
> +	}
>- 
>--        memcpy(ea.value.data + offset, data, n);
>-+	if (!NT_STATUS_IS_OK(status)) {
>++
>+ 	if (!NT_STATUS_IS_OK(status)) {
> +		TALLOC_FREE(frame);
>-+		return -1;
>-+	}
>+ 		return -1;
>+ 	}
> +	// ? -1
> +	if ((offset + n) > ea.value.length) {
> +		if(!data_blob_realloc(talloc_tos(), &ea.value, offset + n)) {
>@@ -322,17 +304,36 @@
> +	}
> +	memcpy(ea.value.data + offset, data, n);
>  
>+-        if ((offset + n) > ea.value.length-1) {
>+-		uint8_t *tmp;
>+-
>+-		tmp = talloc_realloc(talloc_tos(), ea.value.data, uint8_t,
>+-					   offset + n + 1);
>+-
>+-		if (tmp == NULL) {
>+-			TALLOC_FREE(ea.value.data);
>+-                        errno = ENOMEM;
>+-                        return -1;
>+-                }
>+-		ea.value.data = tmp;
>+-		ea.value.length = offset + n + 1;
>+-		ea.value.data[offset+n] = 0;
>+-        }
>+-
>+-        memcpy(ea.value.data + offset, data, n);
>+-
>  	ret = SMB_VFS_SETXATTR(fsp->conn,
>  			       fsp->fsp_name,
>  			       sio->xattr_name,
>  			       ea.value.data, ea.value.length, 0);
> -	TALLOC_FREE(ea.value.data);
>+ 
>++	TALLOC_FREE(frame);
> +
>-+	TALLOC_FREE(frame);
>- 
>  	if (ret == -1) {
>  		return -1;
>-@@ -1033,15 +1103,17 @@ static ssize_t streams_xattr_pread(vfs_h
>+ 	}
>+@@ -1001,15 +1071,17 @@
>  				   files_struct *fsp, void *data,
>  				   size_t n, off_t offset)
>  {
>@@ -355,7 +356,7 @@
>  
>  	if (sio == NULL) {
>  		return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
>-@@ -1051,6 +1123,8 @@ static ssize_t streams_xattr_pread(vfs_h
>+@@ -1019,6 +1091,8 @@
>  		return -1;
>  	}
>  
>@@ -364,8 +365,8 @@
>  	/* Create an smb_filename with stream_name == NULL. */
>  	smb_fname_base = synthetic_smb_fname(talloc_tos(),
>  					sio->base,
>-@@ -1058,31 +1132,35 @@ static ssize_t streams_xattr_pread(vfs_h
>- 					NULL,
>+@@ -1027,31 +1101,35 @@
>+ 					fsp->fsp_name->twrp,
>  					fsp->fsp_name->flags);
>  	if (smb_fname_base == NULL) {
> +		TALLOC_FREE(frame);
>@@ -413,7 +414,7 @@
>  }
>  
>  struct streams_xattr_pread_state {
>-@@ -1249,16 +1327,18 @@ static int streams_xattr_ftruncate(struc
>+@@ -1218,17 +1296,19 @@
>  					struct files_struct *fsp,
>  					off_t offset)
>  {
>@@ -433,13 +434,14 @@
> +	NTSTATUS status;
> +	size_t orig_length;
> +	int ret;
>-+
>+ 
> +	DEBUG(10, ("streams_xattr_ftruncate: called for file '%s' with offset %lu\n",
> +		   fsp_str_dbg(fsp), (unsigned long)offset));
>- 
>++
>  	if (sio == NULL) {
>  		return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);
>-@@ -1268,6 +1348,8 @@ static int streams_xattr_ftruncate(struc
>+ 	}
>+@@ -1237,6 +1317,8 @@
>  		return -1;
>  	}
>  
>@@ -448,8 +450,8 @@
>  	/* Create an smb_filename with stream_name == NULL. */
>  	smb_fname_base = synthetic_smb_fname(talloc_tos(),
>  					sio->base,
>-@@ -1275,40 +1357,46 @@ static int streams_xattr_ftruncate(struc
>- 					NULL,
>+@@ -1245,40 +1327,46 @@
>+ 					fsp->fsp_name->twrp,
>  					fsp->fsp_name->flags);
>  	if (smb_fname_base == NULL) {
> +		TALLOC_FREE(frame);
>@@ -511,7 +513,7 @@
>  
>  	if (ret == -1) {
>  		return -1;
>-@@ -1326,9 +1414,9 @@ static int streams_xattr_fallocate(struc
>+@@ -1296,9 +1384,9 @@
>          struct stream_io *sio =
>  		(struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
>  
>Index: samba413/files/patch-source3_modules_vfs__virusfilter__utils.c
>===================================================================
>--- samba413/files/patch-source3_modules_vfs__virusfilter__utils.c	(revision 565315)
>+++ samba413/files/patch-source3_modules_vfs__virusfilter__utils.c	(working copy)
>@@ -1,8 +1,8 @@
>---- source3/modules/vfs_virusfilter_utils.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/modules/vfs_virusfilter_utils.c
>-@@ -392,6 +392,10 @@ bool virusfilter_io_writel(
>+--- source3/modules/vfs_virusfilter_utils.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/modules/vfs_virusfilter_utils.c	2021-02-15 17:33:56.933222000 +0000
>+@@ -399,6 +399,10 @@
>  
>- bool virusfilter_io_writefl(
>+ bool PRINTF_ATTRIBUTE(2, 3) virusfilter_io_writefl(
>  	struct virusfilter_io_handle *io_h,
> +	const char *data_fmt, ...) PRINTF_ATTRIBUTE(2, 3);
> +
>@@ -11,9 +11,9 @@
>  	const char *data_fmt, ...)
>  {
>  	va_list ap;
>-@@ -415,6 +419,10 @@ bool virusfilter_io_writefl(
>+@@ -422,6 +426,10 @@
>  
>- bool virusfilter_io_vwritefl(
>+ bool PRINTF_ATTRIBUTE(2, 0) virusfilter_io_vwritefl(
>  	struct virusfilter_io_handle *io_h,
> +	const char *data_fmt, va_list ap) PRINTF_ATTRIBUTE(2, 0);
> +
>@@ -22,15 +22,15 @@
>  	const char *data_fmt, va_list ap)
>  {
>  	char data[VIRUSFILTER_IO_BUFFER_SIZE + VIRUSFILTER_IO_EOL_SIZE];
>-@@ -666,6 +674,11 @@ bool virusfilter_io_readl(TALLOC_CTX *ct
>- bool virusfilter_io_writefl_readl(
>- 	struct virusfilter_io_handle *io_h,
>- 	char **read_line,
>+@@ -671,6 +679,11 @@
>+ }
>+ 
>+ bool PRINTF_ATTRIBUTE(3, 4) virusfilter_io_writefl_readl(
>++	struct virusfilter_io_handle *io_h,
>++	char **read_line,
> +	const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
> +
> +bool virusfilter_io_writefl_readl(
>-+	struct virusfilter_io_handle *io_h,
>-+	char **read_line,
>+ 	struct virusfilter_io_handle *io_h,
>+ 	char **read_line,
>  	const char *fmt, ...)
>- {
>- 	bool ok;
>Index: samba413/files/patch-source3_registry_tests_test__regfio.c
>===================================================================
>--- samba413/files/patch-source3_registry_tests_test__regfio.c	(revision 565315)
>+++ samba413/files/patch-source3_registry_tests_test__regfio.c	(working copy)
>@@ -1,6 +1,6 @@
>---- source3/registry/tests/test_regfio.c.orig	2019-05-07 08:38:21 UTC
>-+++ source3/registry/tests/test_regfio.c
>-@@ -24,6 +24,7 @@
>+--- source3/registry/tests/test_regfio.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/registry/tests/test_regfio.c	2021-02-15 17:34:37.803535000 +0000
>+@@ -25,6 +25,7 @@
>  
>  #include <errno.h>
>  #include <stdlib.h>
>Index: samba413/files/patch-source3_utils_net.c
>===================================================================
>--- samba413/files/patch-source3_utils_net.c	(revision 565315)
>+++ samba413/files/patch-source3_utils_net.c	(working copy)
>@@ -1,6 +1,6 @@
>---- source3/utils/net.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/utils/net.c
>-@@ -1096,8 +1096,13 @@ static void get_credentials_file(struct 
>+--- source3/utils/net.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/utils/net.c	2021-02-15 17:38:30.248171000 +0000
>+@@ -1382,8 +1382,13 @@
>  		lp_set_cmdline("netbios name", c->opt_requester_name);
>  	}
>  
>Index: samba413/files/patch-source3_utils_net__time.c
>===================================================================
>--- samba413/files/patch-source3_utils_net__time.c	(revision 565315)
>+++ samba413/files/patch-source3_utils_net__time.c	(working copy)
>@@ -1,6 +1,6 @@
>---- source3/utils/net_time.c.orig	2019-01-15 10:07:00 UTC
>-+++ source3/utils/net_time.c
>-@@ -81,10 +81,15 @@ static const char *systime(time_t t)
>+--- source3/utils/net_time.c.orig	2020-07-09 09:33:56.000000000 +0000
>++++ source3/utils/net_time.c	2021-02-15 17:38:59.280288000 +0000
>+@@ -82,10 +82,15 @@
>  	if (!tm) {
>  		return "unknown";
>  	}
>Index: samba413/files/patch-source3_wscript
>===================================================================
>--- samba413/files/patch-source3_wscript	(revision 565315)
>+++ samba413/files/patch-source3_wscript	(working copy)
>@@ -1,6 +1,6 @@
>---- source3/wscript.orig	2019-07-09 10:08:41 UTC
>-+++ source3/wscript
>-@@ -50,6 +50,7 @@ def options(opt):
>+--- source3/wscript.orig	2020-12-15 07:53:45.000000000 +0000
>++++ source3/wscript	2021-02-15 17:40:36.044259000 +0000
>+@@ -71,6 +71,7 @@
>      opt.samba_add_onoff_option('sendfile-support', default=None)
>      opt.samba_add_onoff_option('utmp')
>      opt.samba_add_onoff_option('avahi', with_name="enable", without_name="disable")
>@@ -8,7 +8,7 @@
>      opt.samba_add_onoff_option('iconv')
>      opt.samba_add_onoff_option('acl-support')
>      opt.samba_add_onoff_option('dnsupdate')
>-@@ -784,34 +785,39 @@ msg.msg_accrightslen = sizeof(fd);
>+@@ -851,34 +852,39 @@
>  
>      if Options.options.with_utmp:
>          conf.env.with_utmp = True
>@@ -64,10 +64,11 @@
>                            define='SIZEOF_UTMP_UT_LINE', critical=False)
>          if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'):
>              conf.env.with_utmp = False
>-@@ -833,6 +839,17 @@ msg.msg_accrightslen = sizeof(fd);
>+@@ -899,6 +905,17 @@
>+     else:
>          conf.SET_TARGET_TYPE('avahi-common', 'EMPTY')
>          conf.SET_TARGET_TYPE('avahi-client', 'EMPTY')
>- 
>++
> +    if Options.options.with_dnssd:
> +        conf.env.with_dnssd = True
> +        if not conf.CHECK_HEADERS('dns_sd.h'):
>@@ -78,7 +79,6 @@
> +            conf.DEFINE('WITH_DNSSD_SUPPORT', 1)
> +    else:
> +        conf.SET_TARGET_TYPE('dns_sd', 'EMPTY')
>-+
>+ 
>      if Options.options.with_iconv:
>          conf.env.with_iconv = True
>-         if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
>Index: samba413/files/patch-source3_wscript__build
>===================================================================
>--- samba413/files/patch-source3_wscript__build	(revision 565315)
>+++ samba413/files/patch-source3_wscript__build	(working copy)
>@@ -1,6 +1,6 @@
>---- source3/wscript_build.orig	2020-07-09 13:33:56 UTC
>-+++ source3/wscript_build
>-@@ -233,11 +233,9 @@ bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
>+--- source3/wscript_build.orig	2021-01-26 07:16:58.000000000 +0000
>++++ source3/wscript_build	2021-02-15 17:41:24.676651000 +0000
>+@@ -233,11 +233,9 @@
>                          talloc
>                          replace
>                          util_reg
>@@ -13,7 +13,7 @@
>                          ''')
>  
>  # Do not link against this use 'smbconf'
>-@@ -495,7 +493,7 @@ bld.SAMBA3_LIBRARY('secrets3',
>+@@ -495,7 +493,7 @@
>  
>  bld.SAMBA3_LIBRARY('smbldap',
>                      source='lib/smbldap.c',
>@@ -22,8 +22,8 @@
>                      enabled=bld.CONFIG_SET("HAVE_LDAP"),
>                      private_library=False,
>                      abi_directory='lib/ABI',
>-@@ -721,6 +719,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
>-                         smbd_conn
>+@@ -716,6 +714,7 @@
>+                         samba3core
>                          param_service
>                          AVAHI
> +                        dns_sd
>@@ -30,7 +30,7 @@
>                          PRINTBASE
>                          PROFILE
>                          LOCKING
>-@@ -1129,6 +1128,7 @@ bld.SAMBA3_BINARY('client/smbclient',
>+@@ -1124,6 +1123,7 @@
>                        msrpc3
>                        RPC_NDR_SRVSVC
>                        cli_smb_common
>@@ -38,7 +38,7 @@
>                        archive
>                        ''')
>  
>-@@ -1153,8 +1153,8 @@ bld.SAMBA3_BINARY('smbspool_krb5_wrapper',
>+@@ -1148,8 +1148,8 @@
>                   enabled=bld.CONFIG_SET('HAVE_CUPS'))
>  
>  bld.SAMBA3_BINARY('smbspool_argv_wrapper',
>@@ -49,7 +49,7 @@
>  
>  bld.SAMBA3_BINARY('locktest2',
>                   source='torture/locktest2.c',
>-@@ -1303,7 +1303,7 @@ bld.SAMBA3_BINARY('vfstest',
>+@@ -1298,7 +1298,7 @@
>                        smbconf
>                        SMBREADLINE
>                        ''',
>Index: samba413/files/patch-vfs_freebsd
>===================================================================
>--- samba413/files/patch-vfs_freebsd	(revision 565315)
>+++ samba413/files/patch-vfs_freebsd	(working copy)
>@@ -1,6 +1,6 @@
>---- docs-xml/wscript_build.orig	2019-06-25 00:52:38 UTC
>-+++ docs-xml/wscript_build
>-@@ -79,6 +79,7 @@ vfs_module_manpages = ['vfs_acl_tdb',
>+--- docs-xml/wscript_build.orig	2020-08-28 09:32:54.000000000 +0000
>++++ docs-xml/wscript_build	2021-02-15 17:45:36.817325000 +0000
>+@@ -85,6 +85,7 @@
>                         'vfs_extd_audit',
>                         'vfs_fake_perms',
>                         'vfs_fileid',
>@@ -8,13 +8,12 @@
>                         'vfs_fruit',
>                         'vfs_full_audit',
>                         'vfs_glusterfs',
>---- source3/modules/wscript_build.orig	2019-05-07 08:38:21 UTC
>-+++ source3/modules/wscript_build
>-@@ -613,3 +613,11 @@ bld.SAMBA3_MODULE('vfs_delay_inject',
>-                  init_function='',
>-                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_delay_inject'),
>-                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_delay_inject'))
>-+
>+--- source3/modules/wscript_build.orig	2020-11-03 12:33:19.000000000 +0000
>++++ source3/modules/wscript_build	2021-02-15 17:45:36.819517000 +0000
>+@@ -251,6 +251,14 @@
>+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'),
>+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'))
>+ 
> +bld.SAMBA3_MODULE('vfs_freebsd',
> +                 subsystem='vfs',
> +                 source='vfs_freebsd.c',
>@@ -22,9 +21,12 @@
> +                 init_function='',
> +                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_freebsd'),
> +                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_freebsd'))
>- bld.SAMBA_GENERATOR('nfs41acl-xdr-c',
>---- source3/modules/vfs_freebsd.c.orig	2019-06-22 11:56:57 UTC
>-+++ source3/modules/vfs_freebsd.c
>++
>+ bld.SAMBA_GENERATOR('nfs41acl-h',
>+                     source='nfs41acl.x',
>+                     target='nfs41acl.h',
>+--- source3/modules/vfs_freebsd.c.orig	2021-02-15 17:45:36.822062000 +0000
>++++ source3/modules/vfs_freebsd.c	2021-02-15 17:45:36.824323000 +0000
> @@ -0,0 +1,800 @@
> +/*
> + * This module implements VFS calls specific to FreeBSD
>@@ -826,8 +828,8 @@
> +
> +	return ret;
> +}
>---- docs-xml/manpages/vfs_freebsd.8.xml.orig	2019-06-25 00:51:54 UTC
>-+++ docs-xml/manpages/vfs_freebsd.8.xml
>+--- docs-xml/manpages/vfs_freebsd.8.xml.orig	2021-02-15 17:45:36.826427000 +0000
>++++ docs-xml/manpages/vfs_freebsd.8.xml	2021-02-15 17:45:36.826985000 +0000
> @@ -0,0 +1,169 @@
> +<?xml version="1.0" encoding="iso-8859-1"?>
> +<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
>Index: samba413/pkg-plist
>===================================================================
>--- samba413/pkg-plist	(revision 565315)
>+++ samba413/pkg-plist	(working copy)
>@@ -19,6 +19,13 @@
> bin/regshell
> bin/regtree
> bin/rpcclient
>+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbadd
>+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdel
>+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdump
>+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbedit
>+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbmodify
>+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbrename
>+%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbsearch
> bin/samba-regedit
> %%AD_DC%%bin/samba-tool
> bin/sharesec
>@@ -36,31 +43,19 @@
> bin/testparm
> bin/vfstest
> bin/wbinfo
>-sbin/eventlogadm
>-sbin/nmbd
>-%%AD_DC%%sbin/samba_downgrade_db
>-sbin/smbd
>-sbin/winbindd
>-%%AD_DC%%sbin/samba
>-%%AD_DC%%sbin/samba_dnsupdate
>-%%AD_DC%%sbin/samba-gpupdate
>-%%AD_DC%%sbin/samba_kcc
>-%%AD_DC%%sbin/samba_spnupdate
>-%%AD_DC%%sbin/samba_upgradedns
>+etc/rc.d/samba_server
> include/samba4/charset.h
> include/samba4/core/doserr.h
> include/samba4/core/error.h
> include/samba4/core/hresult.h
>+include/samba4/core/ntstatus.h
> include/samba4/core/ntstatus_gen.h
>-include/samba4/core/ntstatus.h
>+include/samba4/core/werror.h
> include/samba4/core/werror_gen.h
>-include/samba4/core/werror.h
> include/samba4/credentials.h
> include/samba4/dcerpc.h
>+%%AD_DC%%include/samba4/dcerpc_server.h
> include/samba4/dcesrv_core.h
>-%%AD_DC%%include/samba4/dcerpc_server.h
>-%%LDAP%%include/samba4/smb_ldap.h
>-%%LDAP%%include/samba4/smbldap.h
> include/samba4/domain_credentials.h
> include/samba4/gen_ndr/atsvc.h
> include/samba4/gen_ndr/auth.h
>@@ -78,10 +73,10 @@
> include/samba4/gen_ndr/ndr_krb5pac.h
> include/samba4/gen_ndr/ndr_misc.h
> include/samba4/gen_ndr/ndr_nbt.h
>+include/samba4/gen_ndr/ndr_samr.h
> include/samba4/gen_ndr/ndr_samr_c.h
>-include/samba4/gen_ndr/ndr_samr.h
>+include/samba4/gen_ndr/ndr_svcctl.h
> include/samba4/gen_ndr/ndr_svcctl_c.h
>-include/samba4/gen_ndr/ndr_svcctl.h
> include/samba4/gen_ndr/netlogon.h
> include/samba4/gen_ndr/samr.h
> include/samba4/gen_ndr/security.h
>@@ -107,11 +102,12 @@
> include/samba4/samba/version.h
> include/samba4/share.h
> include/samba4/smb2_lease_struct.h
>+include/samba4/smb_ldap.h
> include/samba4/smbconf.h
>+include/samba4/smbldap.h
> include/samba4/tdr.h
>+include/samba4/tsocket.h
> include/samba4/tsocket_internal.h
>-include/samba4/tsocket.h
>-include/samba4/util_ldb.h
> include/samba4/util/attr.h
> include/samba4/util/blocking.h
> include/samba4/util/data_blob.h
>@@ -119,8 +115,8 @@
> include/samba4/util/discard.h
> include/samba4/util/fault.h
> include/samba4/util/genrand.h
>+include/samba4/util/idtree.h
> include/samba4/util/idtree_random.h
>-include/samba4/util/idtree.h
> include/samba4/util/signal.h
> include/samba4/util/string_wrappers.h
> include/samba4/util/substitute.h
>@@ -129,13 +125,357 @@
> include/samba4/util/tevent_werror.h
> include/samba4/util/tfork.h
> include/samba4/util/time.h
>+include/samba4/util_ldb.h
> include/samba4/wbclient.h
>-@dir include/samba4/util
>-@dir include/samba4/samba
>-@dir include/samba4/ndr
>-@dir include/samba4/gen_ndr
>-@dir include/samba4/core
>-@dir include/samba4
>+lib/nss_winbind.so.1
>+lib/nss_wins.so.1
>+lib/pam_winbind.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_ldb_text.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/ldb.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/_glue.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/_ldb.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/auth.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/auth_util.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/colour.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/common.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/compat.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/credentials.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/crypto.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dbchecker.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/auth.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/base.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dcerpc.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dfs.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dns.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsp.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsserver.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsblobs.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsuapi.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/echo.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/epmapper.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/idmap.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/initshutdown.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/irpc.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/krb5pac.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/lsa.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/mdssvc.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/messaging.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/mgmt.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/misc.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/nbt.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/netlogon.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/ntlmssp.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/preg.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/samr.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/security.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/server_id.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/smb_acl.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/spoolss.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/srvsvc.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/svcctl.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/windows_event_ids.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winspool.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/witness.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr.so
>+%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/descriptor.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dnsresolver.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dnsserver.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/domain_update.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/drs_utils.py
>+%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb.so
>+%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb_dns.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/emulate/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/emulate/traffic.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/emulate/traffic_packets.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/forest_update.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gensec.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/getopt.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_ext_loader.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_aas.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_csv.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_inf.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_ini.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_pol.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_scripts_ext.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gp_sec_ext.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gpclass.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/gpo.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/graph.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/hostconfig.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/idmap.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/join.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/debug.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/graph.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/graph_utils.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/kcc_utils.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/kcc/ldif_import_export.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/logger.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/mdb_util.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/messaging.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ms_forest_updates_markdown.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ms_schema.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ms_schema_markdown.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ndr.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/net.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netbios.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/common.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/computer.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/contact.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/domain.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/domain_backup.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/drs.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/dsacl.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/forest.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/fsmo.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/gpo.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/group.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/ldapcmp.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/main.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/nettime.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/ntacl.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/ou.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/processes.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/pso.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/rodc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/schema.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/sites.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/spn.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/testparm.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/user.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd/visualize.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ntacls.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/ntstatus.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/param.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/policy.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/backend.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/common.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/kerberos.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/kerberos_implementation.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/registry.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/remove_dc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/libsmb_samba_internal.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/mdscli.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/param.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/passdb.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3/smbd.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samdb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/schema.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/sd_utils.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/security.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/sites.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/subnets.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/subunit/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/subunit/run.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tdb_util.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_base.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_dsdb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_pass_change.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_base.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_ncalrpc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon_bad_creds.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_pass_change.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_samlogon.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_winbind.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/bug13653.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/check_output.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/downgradedatabase.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/mdfind.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/netads_json.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_dnsupdate.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcacls.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcacls_basic.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol_process.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_learner.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_replay.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_summary.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/common.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/complex_expressions.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/core.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/credentials.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/array.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/integer.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/mdssvc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_testcase.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/sam.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/srvsvc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/string_tests.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dckeytab.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_base.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/server.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_invalid.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_packet.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_tkey.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dns_wildcard.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/docs.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup_offline.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_lock.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_schema_attributes.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/emulate/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic_packet.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/encrypted_secrets.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/gensec.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/getdcname.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/glue.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/gpo.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/graph.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/group_audit.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/join.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph_utils.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/krb5/kcrypto.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/krb5/raw_testcase.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/krb5/rfc4120_pyasn1.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/krb5/s4u_tests.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/krb5/simple_tests.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/krb5/xrealm_tests.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ldap_raw.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/lsa_string.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/messaging.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/net_join.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/net_join_no_spnego.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/netbios.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/netlogonsvc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntacls_backup.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_base.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_krb5.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlmdisabled.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_chauthtok.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_warn_pwd_expire.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/param.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2003.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2008.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_gpgme.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_ldap.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_quality.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/password_test.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/policy.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/posixacl.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/prefork_restart.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/process_limits.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/provision.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/pso.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/py_credentials.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/registry.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3idmapdb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3param.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3passdb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3registry.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/s3windb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/computer.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/contact.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/demote.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dnscmd.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dsacl.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/forest.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/help.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join_lmdb_size.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ou.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/passwordsettings.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/promote_dc_lmdb_size.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_lmdb_size.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_password_check.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/rodc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/schema.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/sites.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_check_password_script.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_base.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_wdigest.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize_drs.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_upgradedns_lmdb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samdb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samdb_api.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/security.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/segfault.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/smb.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/smbd_base.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/smbd_fuzztest.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/source.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/strings.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/subunitrun.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/tdb_util.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/usage.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/xattr.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/upgrade.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/uptodateness.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/werror.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/xattr.py
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so
>+%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so
> lib/samba4/libdcerpc-binding.so
> lib/samba4/libdcerpc-binding.so.0
> lib/samba4/libdcerpc-samr.so
>@@ -164,8 +504,8 @@
> lib/samba4/libsamba-hostconfig.so.0
> lib/samba4/libsamba-passdb.so
> lib/samba4/libsamba-passdb.so.0
>-%%SAMBA4_PYTHON%%lib/samba4/libsamba-policy%%PYTHON_EXT_SUFFIX%%.so
>-%%SAMBA4_PYTHON%%lib/samba4/libsamba-policy%%PYTHON_EXT_SUFFIX%%.so.0
>+%%SAMBA4_PYTHON%%lib/samba4/libsamba-policy.so
>+%%SAMBA4_PYTHON%%lib/samba4/libsamba-policy.so.0
> lib/samba4/libsamba-util.so
> lib/samba4/libsamba-util.so.0
> lib/samba4/libsamdb.so
>@@ -180,19 +520,144 @@
> lib/samba4/libtevent-util.so.0
> lib/samba4/libwbclient.so
> lib/samba4/libwbclient.so.0
>-lib/nss_winbind.so.1
>-lib/nss_wins.so.1
>-lib/pam_winbind.so
>-%%CUPS%%libexec/samba/smbspool_krb5_wrapper
>-%%AD_DC%%lib/samba4/private/libdlz-bind9-for-torture-samba4.so
>-%%AD_DC%%lib/samba4/private/libposix-eadb-samba4.so
>-%%AD_DC%%lib/samba4/private/libprocess-model-samba4.so
>-%%AD_DC%%lib/samba4/private/libservice-samba4.so
>+%%AD_DC%%lib/samba4/modules/bind9/dlz_bind9.so
>+%%AD_DC%%lib/samba4/modules/bind9/dlz_bind9_10.so
>+%%AD_DC%%lib/samba4/modules/bind9/dlz_bind9_11.so
>+%%AD_DC%%lib/samba4/modules/bind9/dlz_bind9_12.so
>+%%AD_DC%%lib/samba4/modules/bind9/dlz_bind9_14.so
>+%%AD_DC%%lib/samba4/modules/bind9/dlz_bind9_16.so
>+%%AD_DC%%lib/samba4/modules/bind9/dlz_bind9_9.so
>+%%AD_DC%%lib/samba4/modules/gensec/krb5.so
>+lib/samba4/modules/idmap/ad.so
>+lib/samba4/modules/idmap/autorid.so
>+lib/samba4/modules/idmap/hash.so
>+lib/samba4/modules/idmap/ldap.so
>+lib/samba4/modules/idmap/nss.so
>+lib/samba4/modules/idmap/rfc2307.so
>+lib/samba4/modules/idmap/rid.so
>+lib/samba4/modules/idmap/script.so
>+lib/samba4/modules/idmap/tdb.so
>+lib/samba4/modules/idmap/tdb2.so
>+lib/samba4/modules/krb5/winbind_krb5_locator.so
>+%%AD_DC%%lib/samba4/modules/ldb/acl.so
>+%%AD_DC%%lib/samba4/modules/ldb/aclread.so
>+%%AD_DC%%lib/samba4/modules/ldb/anr.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/modules/ldb/asq.so
>+%%AD_DC%%lib/samba4/modules/ldb/audit_log.so
>+%%AD_DC%%%%SAMBA4_BUNDLED_LDB%%lib/samba4/modules/ldb/count_attrs.so
>+%%AD_DC%%lib/samba4/modules/ldb/descriptor.so
>+%%AD_DC%%lib/samba4/modules/ldb/dirsync.so
>+%%AD_DC%%lib/samba4/modules/ldb/dns_notify.so
>+%%AD_DC%%lib/samba4/modules/ldb/dsdb_notification.so
>+%%AD_DC%%lib/samba4/modules/ldb/encrypted_secrets.so
>+%%AD_DC%%lib/samba4/modules/ldb/extended_dn_in.so
>+%%AD_DC%%lib/samba4/modules/ldb/extended_dn_out.so
>+%%AD_DC%%lib/samba4/modules/ldb/extended_dn_store.so
>+%%AD_DC%%lib/samba4/modules/ldb/group_audit_log.so
>+lib/samba4/modules/ldb/ildap.so
>+%%AD_DC%%lib/samba4/modules/ldb/instancetype.so
>+%%AD_DC%%lib/samba4/modules/ldb/lazy_commit.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/modules/ldb/ldb.so
>+lib/samba4/modules/ldb/ldbsamba_extensions.so
>+%%AD_DC%%lib/samba4/modules/ldb/linked_attributes.so
>+%%AD_DC%%lib/samba4/modules/ldb/mdb.so
>+%%AD_DC%%lib/samba4/modules/ldb/new_partition.so
>+%%AD_DC%%lib/samba4/modules/ldb/objectclass.so
>+%%AD_DC%%lib/samba4/modules/ldb/objectclass_attrs.so
>+%%AD_DC%%lib/samba4/modules/ldb/objectguid.so
>+%%AD_DC%%lib/samba4/modules/ldb/operational.so
>+%%AD_DC%%lib/samba4/modules/ldb/paged_results.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/modules/ldb/paged_searches.so
>+%%AD_DC%%lib/samba4/modules/ldb/partition.so
>+%%AD_DC%%lib/samba4/modules/ldb/password_hash.so
>+%%AD_DC%%lib/samba4/modules/ldb/ranged_results.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/modules/ldb/rdn_name.so
>+%%AD_DC%%lib/samba4/modules/ldb/repl_meta_data.so
>+%%AD_DC%%lib/samba4/modules/ldb/resolve_oids.so
>+%%AD_DC%%lib/samba4/modules/ldb/rootdse.so
>+%%AD_DC%%lib/samba4/modules/ldb/samba3sam.so
>+%%AD_DC%%lib/samba4/modules/ldb/samba3sid.so
>+%%AD_DC%%lib/samba4/modules/ldb/samba_dsdb.so
>+%%AD_DC%%lib/samba4/modules/ldb/samba_secrets.so
>+%%AD_DC%%lib/samba4/modules/ldb/samldb.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/modules/ldb/sample.so
>+%%AD_DC%%lib/samba4/modules/ldb/schema_data.so
>+%%AD_DC%%lib/samba4/modules/ldb/schema_load.so
>+%%AD_DC%%lib/samba4/modules/ldb/secrets_tdb_sync.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/modules/ldb/server_sort.so
>+%%AD_DC%%lib/samba4/modules/ldb/show_deleted.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/modules/ldb/skel.so
>+%%AD_DC%%lib/samba4/modules/ldb/subtree_delete.so
>+%%AD_DC%%lib/samba4/modules/ldb/subtree_rename.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/modules/ldb/tdb.so
>+%%AD_DC%%lib/samba4/modules/ldb/tombstone_reanimate.so
>+%%AD_DC%%lib/samba4/modules/ldb/unique_object_sids.so
>+%%AD_DC%%lib/samba4/modules/ldb/update_keytab.so
>+%%AD_DC%%lib/samba4/modules/ldb/vlv.so
>+%%AD_DC%%lib/samba4/modules/ldb/wins_ldb.so
>+lib/samba4/modules/nss_info/hash.so
>+lib/samba4/modules/nss_info/rfc2307.so
>+lib/samba4/modules/nss_info/sfu.so
>+lib/samba4/modules/nss_info/sfu20.so
>+lib/samba4/modules/nss_info/template.so
>+%%AD_DC%%lib/samba4/modules/process_model/prefork.so
>+%%AD_DC%%lib/samba4/modules/process_model/standard.so
>+%%AD_DC%%lib/samba4/modules/service/cldap.so
>+%%AD_DC%%lib/samba4/modules/service/dcerpc.so
>+%%AD_DC%%lib/samba4/modules/service/dns.so
>+%%AD_DC%%lib/samba4/modules/service/dns_update.so
>+%%AD_DC%%lib/samba4/modules/service/drepl.so
>+%%AD_DC%%lib/samba4/modules/service/kcc.so
>+%%AD_DC%%lib/samba4/modules/service/kdc.so
>+%%AD_DC%%lib/samba4/modules/service/ldap.so
>+%%AD_DC%%lib/samba4/modules/service/nbtd.so
>+%%AD_DC%%lib/samba4/modules/service/ntp_signd.so
>+%%AD_DC%%lib/samba4/modules/service/s3fs.so
>+%%AD_DC%%lib/samba4/modules/service/winbindd.so
>+%%AD_DC%%lib/samba4/modules/service/wrepl.so
>+lib/samba4/modules/vfs/acl_tdb.so
>+lib/samba4/modules/vfs/acl_xattr.so
>+lib/samba4/modules/vfs/aio_fork.so
>+lib/samba4/modules/vfs/aio_pthread.so
>+lib/samba4/modules/vfs/audit.so
>+lib/samba4/modules/vfs/cacheprime.so
>+lib/samba4/modules/vfs/cap.so
>+lib/samba4/modules/vfs/catia.so
>+lib/samba4/modules/vfs/commit.so
>+lib/samba4/modules/vfs/crossrename.so
>+lib/samba4/modules/vfs/default_quota.so
>+lib/samba4/modules/vfs/dirsort.so
>+lib/samba4/modules/vfs/expand_msdfs.so
>+lib/samba4/modules/vfs/extd_audit.so
>+lib/samba4/modules/vfs/fake_perms.so
>+lib/samba4/modules/vfs/freebsd.so
>+lib/samba4/modules/vfs/full_audit.so
>+lib/samba4/modules/vfs/linux_xfs_sgid.so
>+lib/samba4/modules/vfs/media_harmony.so
>+lib/samba4/modules/vfs/offline.so
>+%%AD_DC%%lib/samba4/modules/vfs/posix_eadb.so
>+lib/samba4/modules/vfs/preopen.so
>+lib/samba4/modules/vfs/readahead.so
>+lib/samba4/modules/vfs/readonly.so
>+lib/samba4/modules/vfs/recycle.so
>+lib/samba4/modules/vfs/shadow_copy.so
>+lib/samba4/modules/vfs/shadow_copy2.so
>+lib/samba4/modules/vfs/shell_snap.so
>+lib/samba4/modules/vfs/streams_depot.so
>+lib/samba4/modules/vfs/streams_xattr.so
>+lib/samba4/modules/vfs/syncops.so
>+lib/samba4/modules/vfs/time_audit.so
>+lib/samba4/modules/vfs/unityed_media.so
>+lib/samba4/modules/vfs/virusfilter.so
>+lib/samba4/modules/vfs/widelinks.so
>+lib/samba4/modules/vfs/worm.so
>+lib/samba4/modules/vfs/xattr_tdb.so
>+lib/samba4/modules/vfs/zfsacl.so
> lib/samba4/private/libCHARSET3-samba4.so
> %%AD_DC%%%%GSSAPI_BUILTIN%%lib/samba4/private/libHDB-SAMBA4-samba4.so
> lib/samba4/private/libLIBWBCLIENT-OLD-samba4.so
>+lib/samba4/private/libMESSAGING-SEND-samba4.so
> lib/samba4/private/libMESSAGING-samba4.so
>-lib/samba4/private/libMESSAGING-SEND-samba4.so
> lib/samba4/private/libaddns-samba4.so
> lib/samba4/private/libads-samba4.so
> %%GSSAPI_BUILTIN%%lib/samba4/private/libasn1-samba4.so.8
>@@ -206,9 +671,9 @@
> lib/samba4/private/libcli-ldap-samba4.so
> lib/samba4/private/libcli-nbt-samba4.so
> lib/samba4/private/libcli-smb-common-samba4.so
>-lib/samba4/private/libclidns-samba4.so
> lib/samba4/private/libcli-spoolss-samba4.so
> lib/samba4/private/libcliauth-samba4.so
>+lib/samba4/private/libclidns-samba4.so
> lib/samba4/private/libcluster-samba4.so
> lib/samba4/private/libcmdline-contexts-samba4.so
> lib/samba4/private/libcmdline-credentials-samba4.so
>@@ -219,9 +684,10 @@
> lib/samba4/private/libdcerpc-samba-samba4.so
> lib/samba4/private/libdcerpc-samba4.so
> %%AD_DC%%lib/samba4/private/libdfs-server-ad-samba4.so
>+%%AD_DC%%lib/samba4/private/libdlz-bind9-for-torture-samba4.so
> %%AD_DC%%lib/samba4/private/libdnsserver-common-samba4.so
>+%%AD_DC%%lib/samba4/private/libdsdb-garbage-collect-tombstones-samba4.so
> lib/samba4/private/libdsdb-module-samba4.so
>-%%AD_DC%%lib/samba4/private/libdsdb-garbage-collect-tombstones-samba4.so
> lib/samba4/private/libevents-samba4.so
> lib/samba4/private/libflag-mapping-samba4.so
> lib/samba4/private/libgenrand-samba4.so
>@@ -242,6 +708,12 @@
> %%GSSAPI_BUILTIN%%lib/samba4/private/libkdc-samba4.so.2
> %%GSSAPI_BUILTIN%%lib/samba4/private/libkrb5-samba4.so.26
> lib/samba4/private/libkrb5samba-samba4.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-cmdline-samba4.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-key-value-samba4.so
>+%%AD_DC%%lib/samba4/private/libldb-mdb-int-samba4.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-tdb-err-map-samba4.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-tdb-int-samba4.so
>+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb.so.2
> lib/samba4/private/libldbsamba-samba4.so
> lib/samba4/private/liblibcli-lsa3-samba4.so
> lib/samba4/private/liblibcli-netlogon3-samba4.so
>@@ -260,8 +732,11 @@
> %%AD_DC%%lib/samba4/private/libpac-samba4.so
> lib/samba4/private/libpopt-samba3-cmdline-samba4.so
> lib/samba4/private/libpopt-samba3-samba4.so
>+lib/samba4/private/libposix-eadb-samba4.so
> lib/samba4/private/libprinter-driver-samba4.so
> lib/samba4/private/libprinting-migrate-samba4.so
>+%%AD_DC%%lib/samba4/private/libprocess-model-samba4.so
>+%%SAMBA4_PYTHON%%lib/samba4/private/libpyldb-util.so.2
> lib/samba4/private/libregistry-samba4.so
> lib/samba4/private/libreplace-samba4.so
> %%GSSAPI_BUILTIN%%lib/samba4/private/libroken-samba4.so.19
>@@ -268,8 +743,8 @@
> lib/samba4/private/libsamba-cluster-support-samba4.so
> lib/samba4/private/libsamba-debug-samba4.so
> lib/samba4/private/libsamba-modules-samba4.so
>-%%SAMBA4_PYTHON%%lib/samba4/private/libsamba-net%%PYTHON_EXT_SUFFIX%%-samba4.so
>-%%SAMBA4_PYTHON%%lib/samba4/private/libsamba-python%%PYTHON_EXT_SUFFIX%%-samba4.so
>+%%SAMBA4_PYTHON%%lib/samba4/private/libsamba-net-samba4.so
>+%%SAMBA4_PYTHON%%lib/samba4/private/libsamba-python-samba4.so
> lib/samba4/private/libsamba-security-samba4.so
> lib/samba4/private/libsamba-sockets-samba4.so
> lib/samba4/private/libsamba3-util-samba4.so
>@@ -278,11 +753,11 @@
> lib/samba4/private/libsecrets3-samba4.so
> lib/samba4/private/libserver-id-db-samba4.so
> lib/samba4/private/libserver-role-samba4.so
>+%%AD_DC%%lib/samba4/private/libservice-samba4.so
> lib/samba4/private/libshares-samba4.so
> lib/samba4/private/libsmb-transport-samba4.so
> lib/samba4/private/libsmbclient-raw-samba4.so
> lib/samba4/private/libsmbd-base-samba4.so
>-lib/samba4/private/libsmbd-conn-samba4.so
> lib/samba4/private/libsmbd-shim-samba4.so
> %%LDAP%%lib/samba4/private/libsmbldaphelper-samba4.so
> lib/samba4/private/libsmbpasswdparser-samba4.so
>@@ -301,230 +776,22 @@
> lib/samba4/private/libwinbind-client-samba4.so
> %%GSSAPI_BUILTIN%%lib/samba4/private/libwind-samba4.so.0
> lib/samba4/private/libxattr-tdb-samba4.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_9.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_10.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_11.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_12.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_13.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_14.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/bind9/dlz_bind9_16.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/gensec/krb5.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/krb5/winbind_krb5_locator.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/acl.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/aclread.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/anr.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/audit_log.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/descriptor.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/dirsync.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/dns_notify.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/dsdb_notification.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/encrypted_secrets.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/extended_dn_in.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/extended_dn_out.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/extended_dn_store.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/group_audit_log.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ildap.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/instancetype.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/lazy_commit.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ldbsamba_extensions.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/linked_attributes.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/new_partition.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/objectclass_attrs.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/objectclass.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/objectguid.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/operational.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/paged_results.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/partition.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/password_hash.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/ranged_results.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/repl_meta_data.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/resolve_oids.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/rootdse.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba_dsdb.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba_secrets.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba3sam.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samba3sid.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/samldb.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/schema_data.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/schema_load.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/secrets_tdb_sync.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/show_deleted.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/subtree_delete.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/subtree_rename.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/tombstone_reanimate.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/unique_object_sids.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/update_keytab.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/vlv.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/wins_ldb.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/process_model/prefork.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/process_model/standard.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/cldap.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/dcerpc.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/dns_update.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/dns.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/drepl.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/kcc.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/kdc.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/ldap.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/nbtd.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/ntp_signd.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/s3fs.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/winbindd.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/service/wrepl.so
>-%%AD_DC%%%%SAMBA4_MODULEDIR%%/vfs/posix_eadb.so
>-%%SAMBA4_MODULEDIR%%/vfs/acl_tdb.so
>-%%SAMBA4_MODULEDIR%%/vfs/acl_xattr.so
>-%%SAMBA4_MODULEDIR%%/vfs/aio_fork.so
>-%%SAMBA4_MODULEDIR%%/vfs/aio_pthread.so
>-%%SAMBA4_MODULEDIR%%/vfs/audit.so
>-%%SAMBA4_MODULEDIR%%/vfs/cap.so
>-%%SAMBA4_MODULEDIR%%/vfs/catia.so
>-%%SAMBA4_MODULEDIR%%/vfs/commit.so
>-%%SAMBA4_MODULEDIR%%/vfs/crossrename.so
>-%%SAMBA4_MODULEDIR%%/vfs/default_quota.so
>-%%SAMBA4_MODULEDIR%%/vfs/dirsort.so
>-%%SAMBA4_MODULEDIR%%/vfs/expand_msdfs.so
>-%%SAMBA4_MODULEDIR%%/vfs/extd_audit.so
>-%%SAMBA4_MODULEDIR%%/vfs/fake_perms.so
>-%%SAMBA4_MODULEDIR%%/vfs/full_audit.so
>-%%SAMBA4_MODULEDIR%%/vfs/linux_xfs_sgid.so
>-%%SAMBA4_MODULEDIR%%/vfs/media_harmony.so
>-%%SAMBA4_MODULEDIR%%/vfs/offline.so
>-%%SAMBA4_MODULEDIR%%/vfs/preopen.so
>-%%SAMBA4_MODULEDIR%%/vfs/readahead.so
>-%%SAMBA4_MODULEDIR%%/vfs/readonly.so
>-%%SAMBA4_MODULEDIR%%/vfs/recycle.so
>-%%SAMBA4_MODULEDIR%%/vfs/shadow_copy.so
>-%%SAMBA4_MODULEDIR%%/vfs/shadow_copy2.so
>-%%SAMBA4_MODULEDIR%%/vfs/shell_snap.so
>-%%SAMBA4_MODULEDIR%%/vfs/streams_depot.so
>-%%SAMBA4_MODULEDIR%%/vfs/streams_xattr.so
>-%%SAMBA4_MODULEDIR%%/vfs/syncops.so
>-%%SAMBA4_MODULEDIR%%/vfs/time_audit.so
>-%%SAMBA4_MODULEDIR%%/vfs/unityed_media.so
>-%%SAMBA4_MODULEDIR%%/vfs/virusfilter.so
>-%%SAMBA4_MODULEDIR%%/vfs/widelinks.so
>-%%SAMBA4_MODULEDIR%%/vfs/worm.so
>-%%SAMBA4_MODULEDIR%%/vfs/xattr_tdb.so
>-%%SAMBA4_MODULEDIR%%/vfs/zfsacl.so
>-@dir %%SAMBA4_MODULEDIR%%/vfs
>-%%AD_DC%%@dir %%SAMBA4_MODULEDIR%%/service
>-%%AD_DC%%@dir %%SAMBA4_MODULEDIR%%/process_model
>-@dir %%SAMBA4_MODULEDIR%%/perfcount
>-@dir %%SAMBA4_MODULEDIR%%/pdb
>-@dir %%SAMBA4_MODULEDIR%%/nss_info
>-@dir %%SAMBA4_MODULEDIR%%/ldb
>-@dir %%SAMBA4_MODULEDIR%%/idmap
>-@dir %%SAMBA4_MODULEDIR%%/gpext
>-@dir %%SAMBA4_MODULEDIR%%/gensec
>-@dir %%SAMBA4_MODULEDIR%%/bind9
>-@dir %%SAMBA4_MODULEDIR%%/auth
>-@dir %%SAMBA4_MODULEDIR%%
>-@dir lib/samba4/private
>-@dir lib/samba4
>-%%PKGCONFIGDIR%%/dcerpc.pc
>-%%PKGCONFIGDIR%%/dcerpc_samr.pc
>-%%AD_DC%%%%PKGCONFIGDIR%%/dcerpc_server.pc
>-%%PKGCONFIGDIR%%/ndr.pc
>-%%PKGCONFIGDIR%%/ndr_krb5pac.pc
>-%%PKGCONFIGDIR%%/ndr_nbt.pc
>-%%PKGCONFIGDIR%%/ndr_standard.pc
>-%%PKGCONFIGDIR%%/netapi.pc
>-%%PKGCONFIGDIR%%/samba-credentials.pc
>-%%PKGCONFIGDIR%%/samba-hostconfig.pc
>-%%SAMBA4_PYTHON%%%%PKGCONFIGDIR%%/samba-policy%%PYTHON_EXT_SUFFIX%%.pc
>-%%PKGCONFIGDIR%%/samba-util.pc
>-%%PKGCONFIGDIR%%/samdb.pc
>-%%PKGCONFIGDIR%%/smbclient.pc
>-%%PKGCONFIGDIR%%/wbclient.pc
>-@comment Setup files
>-%%SPOTLIGHT%%%%DATADIR%%/samba/mdssvc/elasticsearch_mappings.json
>-%%AD_DC%%%%DATADIR%%/samba/admx/en-US/samba.adml
>-%%AD_DC%%%%DATADIR%%/samba/admx/samba.admx
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Classes__Windows_Server_2012_R2.ldf
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Classes__Windows_Server_2016.ldf
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2008_R2.ldf
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2012.ldf
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2008_R2.ldf
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2012.ldf
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/licence.txt
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt
>-%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt
>-%%AD_DC%%%%DATADIR%%/setup/adprep/fix-forest-rev.ldf
>-%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Forest-Wide-Updates.md
>-%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch49.ldf.diff
>-%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch50.ldf.diff
>-%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch51.ldf.diff
>-%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch57.ldf.diff
>-%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch59.ldf.diff
>-%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Schema-Updates.md
>-%%AD_DC%%%%DATADIR%%/setup/aggregate_schema.ldif
>-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
>-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
>-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
>-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
>-%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
>-%%AD_DC%%%%DATADIR%%/setup/dns_update_list
>-%%AD_DC%%%%DATADIR%%/setup/extended-rights.ldif
>-%%AD_DC%%%%DATADIR%%/setup/idmap_init.ldif
>-%%AD_DC%%%%DATADIR%%/setup/krb5.conf
>-%%AD_DC%%%%DATADIR%%/setup/named.conf
>-%%AD_DC%%%%DATADIR%%/setup/named.conf.dlz
>-%%AD_DC%%%%DATADIR%%/setup/named.conf.update
>-%%AD_DC%%%%DATADIR%%/setup/named.txt
>-%%AD_DC%%%%DATADIR%%/setup/prefixMap.txt
>-%%AD_DC%%%%DATADIR%%/setup/provision_basedn_modify.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_basedn_options.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_basedn_references.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_basedn.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_computers_add.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_computers_modify.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_configuration_basedn.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_configuration_modify.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_configuration_references.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_configuration.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_dns_accounts_add.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_dns_add_samba.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_add.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_modify.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_partitions.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_group_policy.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_init.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_partitions.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_privilege.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_rootdse_add.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_rootdse_modify.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn_modify.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_self_join_config.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_config.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_schema.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_self_join.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_users_add.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_users_modify.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_users.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision_well_known_sec_princ.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision.ldif
>-%%AD_DC%%%%DATADIR%%/setup/provision.reg
>-%%AD_DC%%%%DATADIR%%/setup/provision.zone
>-%%AD_DC%%%%DATADIR%%/setup/schema_samba4.ldif
>-%%AD_DC%%%%DATADIR%%/setup/secrets_dns.ldif
>-%%AD_DC%%%%DATADIR%%/setup/secrets_init.ldif
>-%%AD_DC%%%%DATADIR%%/setup/secrets.ldif
>-%%AD_DC%%%%DATADIR%%/setup/share.ldif
>-%%AD_DC%%%%DATADIR%%/setup/spn_update_list
>-%%AD_DC%%%%DATADIR%%/setup/ypServ30.ldif
>-%%AD_DC%%@dir %%DATADIR%%/setup/display-specifiers
>-%%AD_DC%%@dir %%DATADIR%%/setup/ad-schema
>-%%AD_DC%%@dir %%DATADIR%%/setup
>-%%AD_DC%%@dir %%DATADIR%%
>-@comment Man pages
>+libdata/ldconfig/samba413-OLN
>+libdata/pkgconfig/dcerpc.pc
>+libdata/pkgconfig/dcerpc_samr.pc
>+%%AD_DC%%libdata/pkgconfig/dcerpc_server.pc
>+libdata/pkgconfig/ndr.pc
>+libdata/pkgconfig/ndr_krb5pac.pc
>+libdata/pkgconfig/ndr_nbt.pc
>+libdata/pkgconfig/ndr_standard.pc
>+libdata/pkgconfig/netapi.pc
>+libdata/pkgconfig/samba-credentials.pc
>+libdata/pkgconfig/samba-hostconfig.pc
>+%%SAMBA4_PYTHON%%libdata/pkgconfig/samba-policy.pc
>+libdata/pkgconfig/samba-util.pc
>+libdata/pkgconfig/samdb.pc
>+libdata/pkgconfig/smbclient.pc
>+libdata/pkgconfig/wbclient.pc
> man/man1/dbwrap_tool.1.gz
> man/man1/findsmb.1.gz
> man/man1/gentest.1.gz
>@@ -543,6 +810,12 @@
> man/man1/regshell.1.gz
> man/man1/regtree.1.gz
> man/man1/rpcclient.1.gz
>+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbadd.1.gz
>+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbdel.1.gz
>+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbedit.1.gz
>+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbmodify.1.gz
>+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbrename.1.gz
>+%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbsearch.1.gz
> man/man1/sharesec.1.gz
> man/man1/smbcacls.1.gz
> man/man1/smbclient.1.gz
>@@ -559,7 +832,7 @@
> man/man5/lmhosts.5.gz
> man/man5/pam_winbind.conf.5.gz
> man/man5/smb.conf.5.gz
>-man/man5/smb4.conf.5.gz
>+man/man5/%%SAMBA4_CONFIG%%.5.gz
> man/man5/smbgetrc.5.gz
> man/man5/smbpasswd.5.gz
> man/man7/libsmbclient.7.gz
>@@ -582,14 +855,13 @@
> man/man8/nmbd.8.gz
> man/man8/pam_winbind.8.gz
> man/man8/pdbedit.8.gz
>-man/man8/samba_downgrade_db.8.gz
>-man/man8/samba-gpupdate.8.gz
>+%%SAMBA4_PYTHON%%man/man8/samba-gpupdate.8.gz
> man/man8/samba-regedit.8.gz
> man/man8/samba-tool.8.gz
> man/man8/samba.8.gz
>+man/man8/samba_downgrade_db.8.gz
> man/man8/smbd.8.gz
> man/man8/smbpasswd.8.gz
>-man/man8/smbspool_krb5_wrapper.8.gz
> man/man8/smbspool.8.gz
> man/man8/vfs_acl_tdb.8.gz
> man/man8/vfs_acl_xattr.8.gz
>@@ -629,12 +901,160 @@
> man/man8/vfs_zfsacl.8.gz
> man/man8/winbind_krb5_locator.8.gz
> man/man8/winbindd.8.gz
>+sbin/eventlogadm
>+sbin/nmbd
>+%%AD_DC%%sbin/samba
>+%%SAMBA4_PYTHON%%sbin/samba-gpupdate
>+%%AD_DC%%sbin/samba_dnsupdate
>+%%AD_DC%%sbin/samba_downgrade_db
>+%%AD_DC%%sbin/samba_kcc
>+%%AD_DC%%sbin/samba_spnupdate
>+%%AD_DC%%sbin/samba_upgradedns
>+sbin/smbd
>+sbin/winbindd
>+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
>+%%AD_DC%%%%DATADIR%%/samba/admx/en-US/samba.adml
>+%%AD_DC%%%%DATADIR%%/samba/admx/samba.admx
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Classes__Windows_Server_2012_R2.ldf
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Classes__Windows_Server_2016.ldf
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2008_R2.ldf
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2012.ldf
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2008_R2.ldf
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2012.ldf
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt
>+%%AD_DC%%%%DATADIR%%/setup/ad-schema/licence.txt
>+%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Forest-Wide-Updates.md
>+%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch49.ldf.diff
>+%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch50.ldf.diff
>+%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch51.ldf.diff
>+%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch57.ldf.diff
>+%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch59.ldf.diff
>+%%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Schema-Updates.md
>+%%AD_DC%%%%DATADIR%%/setup/adprep/fix-forest-rev.ldf
>+%%AD_DC%%%%DATADIR%%/setup/aggregate_schema.ldif
>+%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
>+%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
>+%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
>+%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
>+%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
>+%%AD_DC%%%%DATADIR%%/setup/dns_update_list
>+%%AD_DC%%%%DATADIR%%/setup/extended-rights.ldif
>+%%AD_DC%%%%DATADIR%%/setup/idmap_init.ldif
>+%%AD_DC%%%%DATADIR%%/setup/krb5.conf
>+%%AD_DC%%%%DATADIR%%/setup/named.conf
>+%%AD_DC%%%%DATADIR%%/setup/named.conf.dlz
>+%%AD_DC%%%%DATADIR%%/setup/named.conf.update
>+%%AD_DC%%%%DATADIR%%/setup/named.txt
>+%%AD_DC%%%%DATADIR%%/setup/prefixMap.txt
>+%%AD_DC%%%%DATADIR%%/setup/provision.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision.reg
>+%%AD_DC%%%%DATADIR%%/setup/provision.zone
>+%%AD_DC%%%%DATADIR%%/setup/provision_basedn.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_basedn_modify.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_basedn_options.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_basedn_references.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_computers_add.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_computers_modify.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_configuration.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_configuration_basedn.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_configuration_modify.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_configuration_references.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_dns_accounts_add.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_dns_add_samba.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_add.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_modify.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_partitions.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_group_policy.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_init.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_partitions.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_privilege.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_rootdse_add.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_rootdse_modify.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn_modify.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_self_join.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_self_join_config.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_config.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_schema.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_users.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_users_add.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_users_modify.ldif
>+%%AD_DC%%%%DATADIR%%/setup/provision_well_known_sec_princ.ldif
>+%%AD_DC%%%%DATADIR%%/setup/schema_samba4.ldif
>+%%AD_DC%%%%DATADIR%%/setup/secrets.ldif
>+%%AD_DC%%%%DATADIR%%/setup/secrets_dns.ldif
>+%%AD_DC%%%%DATADIR%%/setup/secrets_init.ldif
>+%%AD_DC%%%%DATADIR%%/setup/share.ldif
>+%%AD_DC%%%%DATADIR%%/setup/spn_update_list
>+%%AD_DC%%%%DATADIR%%/setup/ypServ30.ldif
>+%%AD_DC%%@dir %%SAMBA4_MODULEDIR%%/service
>+%%AD_DC%%@dir %%SAMBA4_MODULEDIR%%/process_model
>+@dir %%SAMBA4_MODULEDIR%%/auth
>+@dir %%SAMBA4_MODULEDIR%%/gpext
>+@dir %%SAMBA4_MODULEDIR%%/pdb
>+@dir %%SAMBA4_MODULEDIR%%/perfcount
>+@dir %%SAMBA4_BINDDNSDIR%%
>+@dir %%SAMBA4_PRIVATEDIR%%
>+@dir %%SAMBA4_LOCKDIR%%
>+@dir %%SAMBA4_LOGDIR%%
> @dir %%SAMBA4_RUNDIR%%
>-@dir %%SAMBA4_LOGDIR%%
>-@dir %%SAMBA4_LOCKDIR%%
>-@dir %%SAMBA4_PRIVATEDIR%%
>-@dir %%SAMBA4_BINDDNSDIR%%
>-@comment Cluster
>+@comment unverified inherited block
>+%%SPOTLIGHT%%%%DATADIR%%/samba/mdssvc/elasticsearch_mappings.json
>+@dir %%SAMBA4_MODULEDIR%%/nss_info
>+@dir %%SAMBA4_MODULEDIR%%/ldb
>+@dir %%SAMBA4_MODULEDIR%%/idmap
>+@dir %%SAMBA4_MODULEDIR%%/gensec
>+@dir %%SAMBA4_MODULEDIR%%/bind9
>+@dir %%SAMBA4_MODULEDIR%%
>+%%SAMBA4_PYTHON%%@dir %%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool
>+%%SAMBA4_PYTHON%%@dir %%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
>+%%SAMBA4_PYTHON%%@dir %%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests/blackbox
>+%%SAMBA4_PYTHON%%@dir %%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/tests
>+%%SAMBA4_PYTHON%%@dir %%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/samba3
>+%%SAMBA4_PYTHON%%@dir %%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/provision
>+%%SAMBA4_PYTHON%%@dir %%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/netcmd
>+%%SAMBA4_PYTHON%%@dir %%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba/dcerpc
>+%%SAMBA4_PYTHON%%@dir %%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/samba
>+%%PKGCONFIGDIR%%/dcerpc.pc
>+%%PKGCONFIGDIR%%/dcerpc_samr.pc
>+%%AD_DC%%%%PKGCONFIGDIR%%/dcerpc_server.pc
>+%%PKGCONFIGDIR%%/ndr.pc
>+%%PKGCONFIGDIR%%/ndr_krb5pac.pc
>+%%PKGCONFIGDIR%%/ndr_nbt.pc
>+%%PKGCONFIGDIR%%/ndr_standard.pc
>+%%PKGCONFIGDIR%%/netapi.pc
>+%%PKGCONFIGDIR%%/samba-credentials.pc
>+%%PKGCONFIGDIR%%/samba-hostconfig.pc
>+%%SAMBA4_PYTHON%%%%PKGCONFIGDIR%%/samba-policy%%PYTHON_EXT_SUFFIX%%.pc
>+%%PKGCONFIGDIR%%/samba-util.pc
>+%%PKGCONFIGDIR%%/samdb.pc
>+%%PKGCONFIGDIR%%/smbclient.pc
>+%%PKGCONFIGDIR%%/wbclient.pc
>+%%SAMBA4_BUNDLED_CMOCKA%%lib/samba4/private/libcmocka-samba4.so
>+%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so
>+%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%lib/samba4/private/libpytalloc-util.so.2
>+%%SAMBA4_BUNDLED_TALLOC%%lib/samba4/private/libtalloc.so.2
>+%%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz
>+%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
>+%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so
>+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbbackup
>+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbdump
>+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbrestore
>+%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbtool
>+%%SAMBA4_BUNDLED_TDB%%lib/samba4/private/libtdb.so.1
>+%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent%%PYTHON_EXT_SUFFIX%%.so
>+%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py
>+%%SAMBA4_BUNDLED_TEVENT%%lib/samba4/private/libtevent.so.0
>+%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbbackup.8.gz
>+%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbdump.8.gz
>+%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbrestore.8.gz
>+%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbtool.8.gz
> %%CLUSTER%%bin/ctdb
> %%CLUSTER%%bin/ctdb_diagnostics
> %%CLUSTER%%bin/ltdbtool
>@@ -712,406 +1132,3 @@
> %%CLUSTER%%@dir /var/lib/ctdb
> %%CLUSTER%%@dir /var/lib
> %%CLUSTER%%@dir /var/run/ctdb
>-@comment Python block
>-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab%%PYTHON_EXT_SUFFIX%%.so
>-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb%%PYTHON_EXT_SUFFIX%%.so
>-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native%%PYTHON_EXT_SUFFIX%%.so
>-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/_glue%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/_ldb%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/auth_util.py
>-%%PYTHON_SITELIBDIR%%/samba/auth%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/colour.py
>-%%PYTHON_SITELIBDIR%%/samba/common.py
>-%%PYTHON_SITELIBDIR%%/samba/compat.py
>-%%PYTHON_SITELIBDIR%%/samba/credentials%%PYTHON_EXT_SUFFIX%%.so
>-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb_dns%%PYTHON_EXT_SUFFIX%%.so
>-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/crypto%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dbchecker.py
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/auth%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/base%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/dcerpc%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/dfs%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/dns%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsp%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/dnsserver%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsblobs%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/drsuapi%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/echo%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/epmapper%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/idmap%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/initshutdown%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/irpc%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/krb5pac%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/lsa%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/mdssvc%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/messaging%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/mgmt%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/misc%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/nbt%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/netlogon%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/ntlmssp%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/preg%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/samr%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/security%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/server_id%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/smb_acl%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/spoolss%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/srvsvc%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/svcctl%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/windows_event_ids%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/winspool%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/witness%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/descriptor.py
>-%%PYTHON_SITELIBDIR%%/samba/dnsserver.py
>-%%PYTHON_SITELIBDIR%%/samba/domain_update.py
>-%%PYTHON_SITELIBDIR%%/samba/drs_utils.py
>-%%PYTHON_SITELIBDIR%%/samba/emulate/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/emulate/traffic_packets.py
>-%%PYTHON_SITELIBDIR%%/samba/emulate/traffic.py
>-%%PYTHON_SITELIBDIR%%/samba/forest_update.py
>-%%PYTHON_SITELIBDIR%%/samba/gensec%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/getopt.py
>-%%PYTHON_SITELIBDIR%%/samba/gp_ext_loader.py
>-%%PYTHON_SITELIBDIR%%/samba/gp_parse/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_aas.py
>-%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_csv.py
>-%%PYTHON_SITELIBDIR%%/samba/gp_scripts_ext.py
>-%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_inf.py
>-%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_ini.py
>-%%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_pol.py
>-%%PYTHON_SITELIBDIR%%/samba/gp_sec_ext.py
>-%%PYTHON_SITELIBDIR%%/samba/gpclass.py
>-%%PYTHON_SITELIBDIR%%/samba/gpo%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/graph.py
>-%%PYTHON_SITELIBDIR%%/samba/hostconfig.py
>-%%PYTHON_SITELIBDIR%%/samba/idmap.py
>-%%PYTHON_SITELIBDIR%%/samba/join.py
>-%%PYTHON_SITELIBDIR%%/samba/kcc/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/kcc/debug.py
>-%%PYTHON_SITELIBDIR%%/samba/kcc/graph_utils.py
>-%%PYTHON_SITELIBDIR%%/samba/kcc/graph.py
>-%%PYTHON_SITELIBDIR%%/samba/kcc/kcc_utils.py
>-%%PYTHON_SITELIBDIR%%/samba/kcc/ldif_import_export.py
>-%%PYTHON_SITELIBDIR%%/samba/logger.py
>-%%PYTHON_SITELIBDIR%%/samba/mdb_util.py
>-%%PYTHON_SITELIBDIR%%/samba/messaging%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/ms_display_specifiers.py
>-%%PYTHON_SITELIBDIR%%/samba/ms_forest_updates_markdown.py
>-%%PYTHON_SITELIBDIR%%/samba/ms_schema_markdown.py
>-%%PYTHON_SITELIBDIR%%/samba/ms_schema.py
>-%%PYTHON_SITELIBDIR%%/samba/ndr.py
>-%%PYTHON_SITELIBDIR%%/samba/net%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/netbios%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/common.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/computer.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/contact.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/dbcheck.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/delegation.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/dns.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/domain_backup.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/domain.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/drs.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/dsacl.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/forest.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/fsmo.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/gpo.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/group.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/ldapcmp.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/main.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/nettime.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/ntacl.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/ou.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/processes.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/pso.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/rodc.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/schema.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/sites.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/spn.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/testparm.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/user.py
>-%%PYTHON_SITELIBDIR%%/samba/netcmd/visualize.py
>-%%PYTHON_SITELIBDIR%%/samba/ntacls.py
>-%%PYTHON_SITELIBDIR%%/samba/ntstatus%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/param%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/policy%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/provision/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/provision/backend.py
>-%%PYTHON_SITELIBDIR%%/samba/provision/common.py
>-%%PYTHON_SITELIBDIR%%/samba/provision/kerberos_implementation.py
>-%%PYTHON_SITELIBDIR%%/samba/provision/kerberos.py
>-%%PYTHON_SITELIBDIR%%/samba/provision/sambadns.py
>-%%PYTHON_SITELIBDIR%%/samba/registry%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/remove_dc.py
>-%%PYTHON_SITELIBDIR%%/samba/samba3/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/samba3/libsmb_samba_internal%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/samba3/mdscli%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/samba3/param%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/samba3/passdb%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/samba3/smbd%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/samdb.py
>-%%PYTHON_SITELIBDIR%%/samba/schema.py
>-%%PYTHON_SITELIBDIR%%/samba/sd_utils.py
>-%%PYTHON_SITELIBDIR%%/samba/security%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/sites.py
>-%%PYTHON_SITELIBDIR%%/samba/subnets.py
>-%%PYTHON_SITELIBDIR%%/samba/subunit/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/subunit/run.py
>-%%PYTHON_SITELIBDIR%%/samba/tdb_util.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_base.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_dsdb.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/audit_log_pass_change.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_base.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_ncalrpc.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon_bad_creds.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_netlogon.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_pass_change.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_samlogon.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/auth_log_winbind.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/auth_log.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/auth.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/bug13653.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/check_output.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/downgradedatabase.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/mdfind.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/netads_json.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_dnsupdate.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcacls_basic.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcacls.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol_process.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_learner.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_replay.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_summary.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/common.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/complex_expressions.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/core.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/credentials.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/array.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/integer.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/mdssvc.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_testcase.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/sam.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/srvsvc.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/string_tests.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/testrpc.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/unix.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dckeytab.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dns_base.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder_helpers/server.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dns_forwarder.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dns_invalid.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dns_packet.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dns_tkey.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dns_wildcard.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dns.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/docs.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup_offline.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/domain_backup.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_lock.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dsdb_schema_attributes.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/emulate/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic_packet.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/emulate/traffic.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/encrypted_secrets.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/gensec.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/getdcname.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/glue.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/gpo.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/graph.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/group_audit.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/join.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/kcc/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph_utils.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/krb5/kcrypto.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/krb5/raw_testcase.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/krb5/rfc4120_pyasn1.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/krb5/s4u_tests.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/krb5/simple_tests.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/krb5/xrealm_tests.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/ldap_raw.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/lsa_string.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/messaging.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/net_join_no_spnego.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/net_join.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/netbios.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/netcmd.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/netlogonsvc.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/ntacls_backup.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_base.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth_krb5.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/ntlm_auth.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/ntlmdisabled.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_chauthtok.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_warn_pwd_expire.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/param.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2003.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2008.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_gpgme.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_ldap.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/password_hash.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/password_quality.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/password_test.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/policy.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/posixacl.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/prefork_restart.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/process_limits.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/provision.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/pso.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/py_credentials.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/registry.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/s3idmapdb.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/s3param.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/s3passdb.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/s3registry.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/s3windb.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/computer.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/contact.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/demote.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dnscmd.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dsacl.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/forest.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/help.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join_lmdb_size.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/join.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ou.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/passwordsettings.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/processes.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/promote_dc_lmdb_size.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_lmdb_size.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/provision_password_check.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/rodc.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/schema.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/sites.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_check_password_script.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_base.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_wdigest.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize_drs.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/visualize.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba_upgradedns_lmdb.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samdb_api.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/samdb.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/security.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/segfault.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/smb.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/smbd_base.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/smbd_fuzztest.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/source.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/strings.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/subunitrun.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/tdb_util.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/upgrade.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/usage.py
>-%%PYTHON_SITELIBDIR%%/samba/tests/xattr.py
>-%%PYTHON_SITELIBDIR%%/samba/upgrade.py
>-%%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py
>-%%PYTHON_SITELIBDIR%%/samba/uptodateness.py
>-%%PYTHON_SITELIBDIR%%/samba/werror%%PYTHON_EXT_SUFFIX%%.so
>-%%PYTHON_SITELIBDIR%%/samba/xattr.py
>-@dir %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool
>-@dir %%PYTHON_SITELIBDIR%%/samba/tests/dcerpc
>-@dir %%PYTHON_SITELIBDIR%%/samba/tests/blackbox
>-@dir %%PYTHON_SITELIBDIR%%/samba/tests
>-@dir %%PYTHON_SITELIBDIR%%/samba/samba3
>-@dir %%PYTHON_SITELIBDIR%%/samba/provision
>-@dir %%PYTHON_SITELIBDIR%%/samba/netcmd
>-@dir %%PYTHON_SITELIBDIR%%/samba/dcerpc
>-@dir %%PYTHON_SITELIBDIR%%/samba
>-@comment Use bundled libraries
>-%%SAMBA4_BUNDLED_CMOCKA%%lib/samba4/private/libcmocka-samba4.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_ldb_text.py
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/ldb%%PYTHON_EXT_SUFFIX%%.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON%%lib/samba4/private/libpyldb-util%%PYTHON_EXT_SUFFIX%%.so.2
>-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdump
>-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbadd
>-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbdel
>-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbedit
>-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbmodify
>-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbrename
>-%%SAMBA4_BUNDLED_LDB%%bin/samba-ldbsearch
>-%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-cmdline-samba4.so
>-%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-key-value-samba4.so
>-%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-tdb-err-map-samba4.so
>-%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-tdb-int-samba4.so
>-%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb.so.2
>-%%AD_DC%%%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/count_attrs.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/asq.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/ldb.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/paged_searches.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/rdn_name.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/sample.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/server_sort.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/skel.so
>-%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/tdb.so
>-%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so
>-%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON%%lib/samba4/private/libpytalloc-util.so.2
>-%%SAMBA4_BUNDLED_TALLOC%%lib/samba4/private/libtalloc.so.2
>-%%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz
>-%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
>-%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so
>-%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbbackup
>-%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbdump
>-%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbrestore
>-%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbtool
>-%%SAMBA4_BUNDLED_TDB%%lib/samba4/private/libtdb.so.1
>-%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent%%PYTHON_EXT_SUFFIX%%.so
>-%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py
>-%%SAMBA4_BUNDLED_TEVENT%%lib/samba4/private/libtevent.so.0
>-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbadd.1.gz
>-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbdel.1.gz
>-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbedit.1.gz
>-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbmodify.1.gz
>-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbrename.1.gz
>-%%SAMBA4_BUNDLED_LDB%%man/man1/samba-ldbsearch.1.gz
>-%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbbackup.8.gz
>-%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbdump.8.gz
>-%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbrestore.8.gz
>-%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbtool.8.gz

Actions: View | Diff

Attachments on bug 252164: 222494 | 222497 | 222559