samba-4.20.0 has been released [0]. Although samba-4.19 is supported
until March 2025 [1], I prefer to move to the newer branch on current.
7.5 will remain on the 4.19 branch.

The samba update depends on newer versions of libtalloc and tdb, and are
part of the diff below. Several shared libs required a bump.

Run tested on amd64.

Comments/OK?

[0] https://www.samba.org/samba/history/samba-4.20.0.html
[1] https://wiki.samba.org/index.php/Samba_Release_Planning


diff --git databases/tdb/Makefile databases/tdb/Makefile
index 49145f94548..65adbdc2938 100644
--- databases/tdb/Makefile
+++ databases/tdb/Makefile
@@ -2,8 +2,7 @@ COMMENT-main=	trivial database library
 COMMENT-python=	Python ${MODPY_VERSION} bindings for tdb
 
 # Keep in sync with the version bundled in net/samba
-V=		1.4.9
-REVISION=	1
+V=		1.4.10
 
 DISTNAME=	tdb-$V
 PKGNAME-python=	py3-${DISTNAME}
diff --git databases/tdb/distinfo databases/tdb/distinfo
index 53ade095d6b..885f4093736 100644
--- databases/tdb/distinfo
+++ databases/tdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.4.9.tar.gz) = CsImBz46LbhkjaevdEy5X1B2alL+6wAdVYsrMht0p2U=
-SIZE (tdb-1.4.9.tar.gz) = 746608
+SHA256 (tdb-1.4.10.tar.gz) = AjOOM8FsIcnilXHO9SPnaytwhjYlT28wxs8ZXUjGLa8=
+SIZE (tdb-1.4.10.tar.gz) = 747139
diff --git databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
index f7ddb2aad5d..1a8a28706d2 100644
--- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
+++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
@@ -4,7 +4,7 @@
 Index: buildtools/wafsamba/wafsamba.py
 --- buildtools/wafsamba/wafsamba.py.orig
 +++ buildtools/wafsamba/wafsamba.py
-@@ -281,6 +281,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -292,6 +292,13 @@ def SAMBA_LIBRARY(bld, libname, source,
      realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
      link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
  
@@ -18,7 +18,7 @@ Index: buildtools/wafsamba/wafsamba.py
      # we don't want any public libraries without version numbers
      if (not private_library and target_type != 'PYTHON' and not realname):
          if vnum is None and soname is None:
-@@ -398,9 +405,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -408,9 +415,9 @@ def SAMBA_LIBRARY(bld, libname, source,
  
      if pc_files is not None and not private_library:
          if pyembed:
diff --git devel/libtalloc/Makefile devel/libtalloc/Makefile
index d145b85eeed..55f59214856 100644
--- devel/libtalloc/Makefile
+++ devel/libtalloc/Makefile
@@ -2,8 +2,7 @@ COMMENT-main=	hierarchical memory pool system with destructors
 COMMENT-python=	Python ${MODPY_VERSION} bindings for talloc
 
 # Keep in sync with the version bundled in net/samba
-V=		2.4.1
-REVISION=	1
+V=		2.4.2
 
 DISTNAME=	talloc-$V
 PKGNAME-main=	lib${DISTNAME}
diff --git devel/libtalloc/distinfo devel/libtalloc/distinfo
index 303224c1adf..dab0d3b4e1d 100644
--- devel/libtalloc/distinfo
+++ devel/libtalloc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (talloc-2.4.1.tar.gz) = QQpUfwhVcAe+DogZTyGIaDWO3Aq5jJi6jBZ5MNs9M/k=
-SIZE (talloc-2.4.1.tar.gz) = 679160
+SHA256 (talloc-2.4.2.tar.gz) = hez55GXiD5j5lQpS6aQR4UMgvFVfolfYdpe356mx2KY=
+SIZE (talloc-2.4.2.tar.gz) = 679750
diff --git devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py
index 4a8745485b9..98e0fbc18f6 100644
--- devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py
+++ devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py
@@ -3,7 +3,7 @@
 Index: buildtools/wafsamba/wafsamba.py
 --- buildtools/wafsamba/wafsamba.py.orig
 +++ buildtools/wafsamba/wafsamba.py
-@@ -281,6 +281,16 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -292,6 +292,16 @@ def SAMBA_LIBRARY(bld, libname, source,
      realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
      link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
  
diff --git net/samba/Makefile net/samba/Makefile
index 190cf0de907..50005a0eec5 100644
--- net/samba/Makefile
+++ net/samba/Makefile
@@ -1,4 +1,4 @@
-VERSION =		4.19.5
+VERSION =		4.20.0
 DISTNAME =		samba-${VERSION}
 EPOCH =			0
 
@@ -11,23 +11,23 @@ PKGNAME-docs =		samba-docs-${VERSION}
 PKG_ARCH-docs =		*
 
 SHARED_LIBS =		dcerpc			1.1 \
-			dcerpc-binding		4.0 \
+			dcerpc-binding		5.0 \
 			dcerpc-samr		1.0 \
-			dcerpc-server-core	3.0 \
+			dcerpc-server-core	3.1 \
 			ldb			2.3 \
-			ndr			3.1 \
+			ndr			3.2 \
 			ndr-krb5pac		1.3 \
-			ndr-nbt			2.0 \
-			ndr-standard		5.0 \
+			ndr-nbt			2.1 \
+			ndr-standard		6.0 \
 			netapi			3.3 \
-			samba-credentials	1.4 \
+			samba-credentials	1.5 \
 			samba-errors		2.1 \
-			samba-hostconfig	13.0 \
+			samba-hostconfig	14.0 \
 			samba-passdb		3.0 \
-			samba-util		10.0 \
-			samdb			3.0 \
-			smbclient		6.1 \
-			smbconf			14.1 \
+			samba-util		10.1 \
+			samdb			3.1 \
+			smbclient		6.2 \
+			smbconf			15.0 \
 			smbldap			1.0 \
 			tevent			2.3 \
 			tevent-util		2.0 \
@@ -66,8 +66,7 @@ COMPILER_LANGS =	c
 
 MODULES =		lang/python perl
 
-BUILD_DEPENDS =		converters/p5-JSON \
-			databases/tdb,-python \
+BUILD_DEPENDS =		databases/tdb,-python \
 			devel/bison \
 			devel/cmocka \
 			devel/p5-Parse-Yapp>=1.0.5 \
@@ -82,10 +81,10 @@ RUN_DEPENDS-docs =
 LIB_DEPENDS-main =	archivers/libarchive \
 			converters/libiconv \
 			databases/openldap \
-			databases/tdb>=1.4.9 \
+			databases/tdb>=1.4.10 \
 			devel/jansson \
 			devel/libinotify \
-			devel/libtalloc>=2.4.1 \
+			devel/libtalloc>=2.4.2 \
 			devel/libtalloc,-python \
 			devel/popt \
 			net/avahi,-libs \
diff --git net/samba/distinfo net/samba/distinfo
index 3de566b0399..a04b322880c 100644
--- net/samba/distinfo
+++ net/samba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.19.5.tar.gz) = DiQFtM7CnQRZYh9DQKGnSvdx7Hz/7f9DJQytfx+HYF4=
-SIZE (samba-4.19.5.tar.gz) = 41840159
+SHA256 (samba-4.20.0.tar.gz) = AmclQlEKxuXQyRwMFNkKtObsOXxwnpUsbaOm4LTVpC8=
+SIZE (samba-4.20.0.tar.gz) = 42433302
diff --git net/samba/patches/patch-buildtools_wafsamba_samba_abi_py net/samba/patches/patch-buildtools_wafsamba_samba_abi_py
index a0ce3d655c5..8e17a26c9f7 100644
--- net/samba/patches/patch-buildtools_wafsamba_samba_abi_py
+++ net/samba/patches/patch-buildtools_wafsamba_samba_abi_py
@@ -32,7 +32,7 @@ Index: buildtools/wafsamba/samba_abi.py
 -        if k in sorted(invmap.keys()):
 -            f.write("\tglobal:\n")
 -            for s in invmap.get(k, []):
--                f.write("\t\t%s;\n" % s);
+-                f.write("\t\t%s;\n" % s)
 -        f.write("}%s;\n\n" % last_key)
 -        last_key = " %s" % symver
 -    f.write("%s {\n" % current_version)
diff --git net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py
index a669bfb7d4c..2dd80dc9582 100644
--- net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py
+++ net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py
@@ -5,7 +5,7 @@
 Index: buildtools/wafsamba/samba_autoconf.py
 --- buildtools/wafsamba/samba_autoconf.py.orig
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -939,6 +939,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
+@@ -942,6 +942,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
      if not 'EXTRA_LDFLAGS' in conf.env:
          conf.env['EXTRA_LDFLAGS'] = []
      conf.env['EXTRA_LDFLAGS'].extend(TO_LIST(flags))
@@ -33,7 +33,7 @@ Index: buildtools/wafsamba/samba_autoconf.py
      return flags
  
  
-@@ -1010,7 +1031,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
+@@ -1013,7 +1034,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
          # symbols used for fuzzers are only defined by compiler wrappers.
          return
  
diff --git net/samba/patches/patch-buildtools_wafsamba_wafsamba_py net/samba/patches/patch-buildtools_wafsamba_wafsamba_py
index 8596d15e852..d965abf1c5d 100644
--- net/samba/patches/patch-buildtools_wafsamba_wafsamba_py
+++ net/samba/patches/patch-buildtools_wafsamba_wafsamba_py
@@ -7,7 +7,7 @@
 Index: buildtools/wafsamba/wafsamba.py
 --- buildtools/wafsamba/wafsamba.py.orig
 +++ buildtools/wafsamba/wafsamba.py
-@@ -278,6 +278,17 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -289,6 +289,17 @@ def SAMBA_LIBRARY(bld, libname, source,
      # the library itself will depend on that object target
      samba_deps.append(dep_target)
  
@@ -25,7 +25,7 @@ Index: buildtools/wafsamba/wafsamba.py
      realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
      link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
  
-@@ -398,9 +409,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -408,9 +419,9 @@ def SAMBA_LIBRARY(bld, libname, source,
  
      if pc_files is not None and not private_library:
          if pyembed:
diff --git net/samba/patches/patch-lib_ldb_wscript net/samba/patches/patch-lib_ldb_wscript
index 9c09b4f592c..276572bbbe9 100644
--- net/samba/patches/patch-lib_ldb_wscript
+++ net/samba/patches/patch-lib_ldb_wscript
@@ -5,7 +5,7 @@
 Index: lib/ldb/wscript
 --- lib/ldb/wscript.orig
 +++ lib/ldb/wscript
-@@ -69,6 +69,7 @@ def configure(conf):
+@@ -68,6 +68,7 @@ def configure(conf):
      conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb')
  
      conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
@@ -13,7 +13,7 @@ Index: lib/ldb/wscript
  
      if not conf.env.standalone_ldb:
          max_ldb_version = [int(x) for x in VERSION.split(".")]
-@@ -152,8 +153,7 @@ def configure(conf):
+@@ -151,8 +152,7 @@ def configure(conf):
  
          # we don't want any libraries or modules to rely on runtime
          # resolution of symbols
diff --git net/samba/patches/patch-python_samba_provision___init___py net/samba/patches/patch-python_samba_provision___init___py
index 04cd55c0ce0..64dad49d37e 100644
--- net/samba/patches/patch-python_samba_provision___init___py
+++ net/samba/patches/patch-python_samba_provision___init___py
@@ -3,7 +3,7 @@
 Index: python/samba/provision/__init__.py
 --- python/samba/provision/__init__.py.orig
 +++ python/samba/provision/__init__.py
-@@ -2219,7 +2219,7 @@ def provision(logger, session_info, smbconf=None,
+@@ -2201,7 +2201,7 @@ def provision(logger, session_info, smbconf=None,
      root_gid = pwd.getpwuid(root_uid).pw_gid
  
      try:
diff --git net/samba/patches/patch-source3_wscript net/samba/patches/patch-source3_wscript
index dfb3345b508..bf3e6c554f0 100644
--- net/samba/patches/patch-source3_wscript
+++ net/samba/patches/patch-source3_wscript
@@ -4,24 +4,24 @@
 Index: source3/wscript
 --- source3/wscript.orig
 +++ source3/wscript
-@@ -100,6 +100,7 @@ def options(opt):
- 
+@@ -101,6 +101,7 @@ def options(opt):
      # default = None means autodetection
      opt.samba_add_onoff_option('spotlight', with_name="enable", without_name="disable", default=None)
+     opt.samba_add_onoff_option('wsp', with_name="enable", without_name="disable", default=True)
 +    opt.samba_add_onoff_option('glib', default=False)
  
  def configure(conf):
      default_static_modules = []
-@@ -113,7 +114,7 @@ def configure(conf):
-         conf.env.developer = True
-         conf.DEFINE('HAVE_SMB3_UNIX_EXTENSIONS', '1')
+@@ -109,7 +110,7 @@ def configure(conf):
+     forced_static_modules = []
+     forced_shared_modules = []
  
 -    if sys.platform != 'openbsd5':
 +    if not sys.platform.startswith('openbsd'):
          conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
  
      # We crash without vfs_default
-@@ -1789,7 +1790,7 @@ int main(void) {
+@@ -1799,7 +1800,7 @@ int main(void) {
          else:
              conf.fatal('AFS headers not available, but --with-fake-kaserver was specified')
  
diff --git net/samba/patches/patch-source4_dsdb_samdb_ldb_modules_acl_c net/samba/patches/patch-source4_dsdb_samdb_ldb_modules_acl_c
index 47da8eebfd2..64bfa5ad833 100644
--- net/samba/patches/patch-source4_dsdb_samdb_ldb_modules_acl_c
+++ net/samba/patches/patch-source4_dsdb_samdb_ldb_modules_acl_c
@@ -3,7 +3,7 @@ Avoid printf("%s", NULL);
 Index: source4/dsdb/samdb/ldb_modules/acl.c
 --- source4/dsdb/samdb/ldb_modules/acl.c.orig
 +++ source4/dsdb/samdb/ldb_modules/acl.c
-@@ -597,7 +597,7 @@ fail:
+@@ -604,7 +604,7 @@ fail:
  		      (int)samAccountName->length, samAccountName->data,
  		      dnsHostName != NULL ? (int)dnsHostName->length : 0,
  		      dnsHostName != NULL ? (const char *)dnsHostName->data : "",
diff --git net/samba/pkg/PLIST-main net/samba/pkg/PLIST-main
index 7d978e0b30f..cc403b96f9a 100644
--- net/samba/pkg/PLIST-main
+++ net/samba/pkg/PLIST-main
@@ -54,6 +54,7 @@ bin/smbtar
 @bin bin/smbtree
 @bin bin/testparm
 @bin bin/wbinfo
+@bin bin/wspsearch
 include/samba-4.0/
 include/samba-4.0/charset.h
 include/samba-4.0/core/
@@ -123,6 +124,7 @@ include/samba-4.0/samba/session.h
 include/samba-4.0/samba/version.h
 include/samba-4.0/share.h
 include/samba-4.0/smb2_lease_struct.h
+include/samba-4.0/smb3posix.h
 include/samba-4.0/smb_ldap.h
 include/samba-4.0/smbconf.h
 include/samba-4.0/smbldap.h
@@ -228,6 +230,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}functional_level.
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}functional_level.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}getopt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}getopt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gkdi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}gkdi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}hostconfig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -250,6 +254,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}ms_schema_markdow
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}ms_schema_markdown.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}ndr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}ndr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}nt_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}nt_time.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}ntacls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}ntacls.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}policies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -299,6 +305,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/${MODPY_PYCACHE}__init__.$
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/auth.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/base.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/claims.${MODPY_PYC_MAGIC_TAG}so
+@so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/conditional_ace.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/dcerpc.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/dfs.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/dns.${MODPY_PYC_MAGIC_TAG}so
@@ -308,6 +315,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/${MODPY_PYCACHE}__init__.$
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/drsuapi.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/echo.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/epmapper.${MODPY_PYC_MAGIC_TAG}so
+@so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/gkdi.${MODPY_PYC_MAGIC_TAG}so
+@so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/gmsa.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/idmap.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/initshutdown.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/irpc.${MODPY_PYC_MAGIC_TAG}so
@@ -325,6 +334,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/${MODPY_PYCACHE}__init__.$
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/samr.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/security.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/server_id.${MODPY_PYC_MAGIC_TAG}so
+@so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/smb3posix.${MODPY_PYC_MAGIC_TAG}so
+@so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/smbXsrv.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/smb_acl.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/spoolss.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/srvsvc.${MODPY_PYC_MAGIC_TAG}so
@@ -359,6 +370,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/forest_update.py
 lib/python${MODPY_VERSION}/site-packages/samba/functional_level.py
 @so lib/python${MODPY_VERSION}/site-packages/samba/gensec.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/samba/getopt.py
+lib/python${MODPY_VERSION}/site-packages/samba/gkdi.py
 lib/python${MODPY_VERSION}/site-packages/samba/gp/
 lib/python${MODPY_VERSION}/site-packages/samba/gp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}/
@@ -372,6 +384,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}gp_cert_auto_e
 lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}gp_cert_auto_enroll_ext.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}gp_chromium_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}gp_chromium_ext.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}gp_drive_maps_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}gp_drive_maps_ext.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}gp_ext_loader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}gp_ext_loader.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/gp/${MODPY_PYCACHE}gp_firefox_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -412,6 +426,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/gp/gp_centrify_crontab_ext.py
 lib/python${MODPY_VERSION}/site-packages/samba/gp/gp_centrify_sudoers_ext.py
 lib/python${MODPY_VERSION}/site-packages/samba/gp/gp_cert_auto_enroll_ext.py
 lib/python${MODPY_VERSION}/site-packages/samba/gp/gp_chromium_ext.py
+lib/python${MODPY_VERSION}/site-packages/samba/gp/gp_drive_maps_ext.py
 lib/python${MODPY_VERSION}/site-packages/samba/gp/gp_ext_loader.py
 lib/python${MODPY_VERSION}/site-packages/samba/gp/gp_firefox_ext.py
 lib/python${MODPY_VERSION}/site-packages/samba/gp/gp_firewalld_ext.py
@@ -458,6 +473,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/gp_parse/gp_pol.py
 @so lib/python${MODPY_VERSION}/site-packages/samba/gpo.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/samba/graph.py
 lib/python${MODPY_VERSION}/site-packages/samba/hostconfig.py
+@so lib/python${MODPY_VERSION}/site-packages/samba/hresult.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/samba/idmap.py
 lib/python${MODPY_VERSION}/site-packages/samba/join.py
 lib/python${MODPY_VERSION}/site-packages/samba/kcc/
@@ -542,14 +558,14 @@ lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}rodc.${MOD
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}rodc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}schema.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}schema.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}sites.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}sites.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}spn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}spn.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}testparm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}testparm.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/${MODPY_PYCACHE}visualize.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -650,8 +666,12 @@ lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCA
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}model.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}model.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}query.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}query.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}schema.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}schema.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}site.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -667,7 +687,9 @@ lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/auth_silo.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/claim_type.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/fields.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/group.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/model.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/query.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/schema.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/site.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/subnet.py
@@ -696,12 +718,97 @@ lib/python${MODPY_VERSION}/site-packages/samba/netcmd/processes.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/pso.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/rodc.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/schema.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/shell.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/sites.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/spn.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/testparm.py
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}add_unix_attrs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}add_unix_attrs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}delete.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}delete.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}disable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}disable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}edit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}edit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}enable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}enable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}getgroups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}getgroups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}move.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}move.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}password.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}password.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}rename.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}rename.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}sensitive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}sensitive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}setexpiry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}setexpiry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}setpassword.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}setpassword.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}setprimarygroup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}setprimarygroup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}unlock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/${MODPY_PYCACHE}unlock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/add.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/add_unix_attrs.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/${MODPY_PYCACHE}silo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/${MODPY_PYCACHE}silo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/policy.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/auth/silo.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/delete.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/disable.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/edit.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/enable.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/getgroups.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/list.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/move.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/password.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}get_kerberos_ticket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}get_kerberos_ticket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}getpassword.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}getpassword.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}show.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}show.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}syncpasswords.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/${MODPY_PYCACHE}syncpasswords.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/common.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/get_kerberos_ticket.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/getpassword.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/show.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/readpasswords/syncpasswords.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/rename.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/sensitive.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/setexpiry.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/setpassword.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/setprimarygroup.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user/unlock.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/validators.py
 lib/python${MODPY_VERSION}/site-packages/samba/netcmd/visualize.py
+lib/python${MODPY_VERSION}/site-packages/samba/nt_time.py
 lib/python${MODPY_VERSION}/site-packages/samba/ntacls.py
 @so lib/python${MODPY_VERSION}/site-packages/samba/ntstatus.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/samba/param.${MODPY_PYC_MAGIC_TAG}so
@@ -797,6 +904,12 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}complex_exp
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}complex_expressions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}compression.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}compression.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}conditional_ace_assembler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}conditional_ace_assembler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}conditional_ace_bytes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}conditional_ace_bytes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}conditional_ace_claims.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}conditional_ace_claims.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}cred_opt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -845,6 +958,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}get_opt.${M
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}get_opt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}getdcname.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}getdcname.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}gkdi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}gkdi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}glue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}glue.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}gpo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -885,8 +1000,6 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}lsa_string.
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}lsa_string.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}messaging.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}messaging.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}ndr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}ndr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}net_join.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}net_join.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}net_join_no_spnego.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -977,8 +1090,12 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}samdb_api.$
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}samdb_api.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}sddl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}sddl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}sddl_conditional_ace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}sddl_conditional_ace.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}security.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}security.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}security_descriptors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}security_descriptors.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}segfault.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}segfault.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}sid_strings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1009,6 +1126,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}subunitrun.
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}subunitrun.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}tdb_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}tdb_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}token_factory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}token_factory.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}upgrade.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}upgrade.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}upgradeprovision.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1040,6 +1159,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}bu
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}bug13653.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}check_output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}check_output.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}claims.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}claims.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}downgradedatabase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}downgradedatabase.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1050,6 +1171,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ne
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}netads_dns.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}netads_json.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}netads_json.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}rpcd_witness_samba_only.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}rpcd_witness_samba_only.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}samba_dnsupdate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}samba_dnsupdate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}smbcacls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1060,6 +1183,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}sm
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}smbcacls_dfs_propagate_inherit.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}smbcacls_propagate_inhertance.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}smbcacls_propagate_inhertance.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}smbcacls_save_restore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}smbcacls_save_restore.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}smbcontrol.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}smbcontrol.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}smbcontrol_process.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1072,16 +1197,19 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}tr
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}traffic_summary.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/bug13653.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/check_output.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/claims.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/downgradedatabase.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/mdsearch.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_dns.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_json.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/samba_dnsupdate.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/smbcacls.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/smbcacls_basic.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/smbcacls_propagate_inhertance.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/smbcacls_save_restore.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/smbcontrol.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/smbcontrol_process.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/traffic_learner.py
@@ -1090,6 +1218,9 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/traffic_summary.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/common.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/complex_expressions.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/compression.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/conditional_ace_assembler.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/conditional_ace_bytes.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/conditional_ace_claims.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/core.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/cred_opt.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/credentials.py
@@ -1195,6 +1326,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/encrypted_secrets.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/gensec.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/get_opt.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/getdcname.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/gkdi.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/glue.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/gpo.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/gpo_member.py
@@ -1236,12 +1368,16 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}claims
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}claims_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}compatability_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}compatability_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}conditional_ace_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}conditional_ace_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}device_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}device_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}etype_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}etype_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}fast_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}fast_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}gkdi_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}gkdi_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}group_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}group_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kcrypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1252,6 +1388,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kdc_te
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kdc_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kdc_tgs_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kdc_tgs_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kdc_tgt_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kdc_tgt_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kpasswd_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kpasswd_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}lockout_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1272,6 +1410,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}rfc412
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}rfc4120_constants.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}rfc4120_pyasn1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}rfc4120_pyasn1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}rfc4120_pyasn1_generated.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}rfc4120_pyasn1_generated.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}rodc_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}rodc_tests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}s4u_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1303,14 +1443,17 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/authn_policy_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/claims_in_pac.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/claims_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/compatability_tests.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/conditional_ace_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/device_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/etype_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/fast_tests.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/gkdi_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/group_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kcrypto.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kdc_base_test.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kdc_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kdc_tgs_tests.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kdc_tgt_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kpasswd_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/lockout_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
@@ -1321,6 +1464,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/protected_users_tests.
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/raw_testcase.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/rfc4120_constants.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/rfc4120_pyasn1.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/rfc4120_pyasn1_generated.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/rodc_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/s4u_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/salt_tests.py
@@ -1345,7 +1489,17 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/loadparm.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/logfiles.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/lsa_string.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/messaging.py
-lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}gkdi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}gkdi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}gmsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}gmsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}wbint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/${MODPY_PYCACHE}wbint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/gkdi.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/gmsa.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/ndr/wbint.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/net_join.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/net_join_no_spnego.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/netbios.py
@@ -1402,8 +1556,6 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}demote.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}dnscmd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}dnscmd.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_auth_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_auth_base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_auth_policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_auth_policy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_auth_silo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1454,14 +1606,24 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}rodc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}schema.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}schema.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}silo_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}silo_base.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}sites.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}sites.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}timecmd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}timecmd.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_auth_policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_auth_policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_auth_silo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_auth_silo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_check_password_script.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_check_password_script.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_get_kerberos_ticket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_get_kerberos_ticket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_getpassword_gmsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_getpassword_gmsa.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_virtualCryptSHA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_virtualCryptSHA.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}user_virtualCryptSHA_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1481,7 +1643,6 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/computer.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/contact.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/demote.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/dnscmd.py
-lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/domain_auth_base.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/domain_auth_policy.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/domain_auth_silo.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/domain_claim.py
@@ -1507,10 +1668,15 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/provision_passwo
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/provision_userPassword_crypt.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/rodc.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/schema.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/silo_base.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/sites.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/timecmd.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_auth_policy.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_auth_silo.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_check_password_script.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_get_kerberos_ticket.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_getpassword_gmsa.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_virtualCryptSHA.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_virtualCryptSHA_base.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py
@@ -1522,7 +1688,9 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_upgradedns_lmdb.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samdb.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/samdb_api.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/sddl.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/sddl_conditional_ace.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/security.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/security_descriptors.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/segfault.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/sid_strings.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/smb-notify.py
@@ -1538,6 +1706,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/source_chars.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/strings.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/subunitrun.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/tdb_util.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/token_factory.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/upgrade.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/upgradeprovision.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/upgradeprovisionneeddc.py
@@ -1576,119 +1745,119 @@ lib/samba/ldb/
 @so lib/samba/ldb/server_sort.so
 @so lib/samba/ldb/skel.so
 @so lib/samba/ldb/tdb.so
-@so lib/samba/libCHARSET3-samba4.so
-@so lib/samba/libLIBWBCLIENT-OLD-samba4.so
-@so lib/samba/libMESSAGING-SEND-samba4.so
-@so lib/samba/libMESSAGING-samba4.so
-@so lib/samba/libREG-FULL-samba4.so
-@so lib/samba/libRPC-SERVER-LOOP-samba4.so
-@so lib/samba/libRPC-WORKER-samba4.so
-@so lib/samba/libaddns-samba4.so
-@so lib/samba/libads-samba4.so
-@so lib/samba/libasn1-samba4.so
-@so lib/samba/libasn1util-samba4.so
-@so lib/samba/libauth-samba4.so
-@so lib/samba/libauth-unix-token-samba4.so
-@so lib/samba/libauth4-samba4.so
-@so lib/samba/libauthkrb5-samba4.so
-@so lib/samba/libcli-cldap-samba4.so
-@so lib/samba/libcli-ldap-common-samba4.so
-@so lib/samba/libcli-ldap-samba4.so
-@so lib/samba/libcli-nbt-samba4.so
-@so lib/samba/libcli-smb-common-samba4.so
-@so lib/samba/libcli-spoolss-samba4.so
-@so lib/samba/libcliauth-samba4.so
-@so lib/samba/libclidns-samba4.so
-@so lib/samba/libcluster-samba4.so
-@so lib/samba/libcmdline-contexts-samba4.so
-@so lib/samba/libcmdline-samba4.so
-@so lib/samba/libcom-err-samba4.so
-@so lib/samba/libcommon-auth-samba4.so
-@so lib/samba/libdbwrap-samba4.so
-@so lib/samba/libdcerpc-pkt-auth-samba4.so
-@so lib/samba/libdcerpc-samba-samba4.so
-@so lib/samba/libdcerpc-samba4.so
-@so lib/samba/libdnsserver-common-samba4.so
-@so lib/samba/libdsdb-module-samba4.so
-@so lib/samba/libevents-samba4.so
-@so lib/samba/libflag-mapping-samba4.so
-@so lib/samba/libgenrand-samba4.so
-@so lib/samba/libgensec-samba4.so
-@so lib/samba/libgpext-samba4.so
-@so lib/samba/libgpo-samba4.so
-@so lib/samba/libgse-samba4.so
-@so lib/samba/libgss-preauth-samba4.so
-@so lib/samba/libgssapi-samba4.so
-@so lib/samba/libhcrypto-samba4.so
-@so lib/samba/libhdb-samba4.so
-@so lib/samba/libheimbase-samba4.so
-@so lib/samba/libheimntlm-samba4.so
-@so lib/samba/libhttp-samba4.so
-@so lib/samba/libhx509-samba4.so
-@so lib/samba/libidmap-samba4.so
-@so lib/samba/libinterfaces-samba4.so
-@so lib/samba/libiov-buf-samba4.so
-@so lib/samba/libkdc-samba4.so
-@so lib/samba/libkrb5-samba4.so
-@so lib/samba/libkrb5samba-samba4.so
-@so lib/samba/libldb-cmdline-samba4.so
-@so lib/samba/libldb-key-value-samba4.so
-@so lib/samba/libldb-tdb-err-map-samba4.so
-@so lib/samba/libldb-tdb-int-samba4.so
-@so lib/samba/libldbsamba-samba4.so
-@so lib/samba/liblibcli-lsa3-samba4.so
-@so lib/samba/liblibcli-netlogon3-samba4.so
-@so lib/samba/liblibsmb-samba4.so
-@so lib/samba/libmessages-dgm-samba4.so
-@so lib/samba/libmessages-util-samba4.so
-@so lib/samba/libmscat-samba4.so
-@so lib/samba/libmsghdr-samba4.so
-@so lib/samba/libmsrpc3-samba4.so
-@so lib/samba/libndr-samba-samba4.so
-@so lib/samba/libndr-samba4.so
-@so lib/samba/libnet-keytab-samba4.so
-@so lib/samba/libnetif-samba4.so
-@so lib/samba/libnpa-tstream-samba4.so
-@so lib/samba/libnss-info-samba4.so
-@so lib/samba/libposix-eadb-samba4.so
-@so lib/samba/libprinter-driver-samba4.so
-@so lib/samba/libprinting-migrate-samba4.so
-@so lib/samba/libregistry-samba4.so
-@so lib/samba/libreplace-samba4.so
-@so lib/samba/libroken-samba4.so
-@so lib/samba/libsamba-cluster-support-samba4.so
-@so lib/samba/libsamba-debug-samba4.so
-@so lib/samba/libsamba-modules-samba4.so
-@so lib/samba/libsamba-net.${SAMBA_PYTHON_MAGIC_TAG}.so
-@so lib/samba/libsamba-python.${SAMBA_PYTHON_MAGIC_TAG}.so
-@so lib/samba/libsamba-security-samba4.so
-@so lib/samba/libsamba-sockets-samba4.so
-@so lib/samba/libsamba3-util-samba4.so
-@so lib/samba/libsamdb-common-samba4.so
-@so lib/samba/libsecrets3-samba4.so
-@so lib/samba/libserver-id-db-samba4.so
-@so lib/samba/libserver-role-samba4.so
-@so lib/samba/libshares-samba4.so
-@so lib/samba/libsmb-transport-samba4.so
-@so lib/samba/libsmbclient-raw-samba4.so
-@so lib/samba/libsmbd-base-samba4.so
-@so lib/samba/libsmbd-shim-samba4.so
-@so lib/samba/libsmbldaphelper-samba4.so
-@so lib/samba/libsmbpasswdparser-samba4.so
-@so lib/samba/libsocket-blocking-samba4.so
-@so lib/samba/libstable-sort-samba4.so
-@so lib/samba/libsys-rw-samba4.so
-@so lib/samba/libtalloc-report-printf-samba4.so
-@so lib/samba/libtalloc-report-samba4.so
-@so lib/samba/libtdb-wrap-samba4.so
-@so lib/samba/libtime-basic-samba4.so
-@so lib/samba/libtorture-samba4.so
-@so lib/samba/libtrusts-util-samba4.so
-@so lib/samba/libutil-reg-samba4.so
-@so lib/samba/libutil-setid-samba4.so
-@so lib/samba/libutil-tdb-samba4.so
-@so lib/samba/libwind-samba4.so
-@so lib/samba/libxattr-tdb-samba4.so
+@so lib/samba/libCHARSET3-private-samba.so
+@so lib/samba/libLIBWBCLIENT-OLD-private-samba.so
+@so lib/samba/libMESSAGING-SEND-private-samba.so
+@so lib/samba/libMESSAGING-private-samba.so
+@so lib/samba/libREG-FULL-private-samba.so
+@so lib/samba/libRPC-SERVER-LOOP-private-samba.so
+@so lib/samba/libRPC-WORKER-private-samba.so
+@so lib/samba/libaddns-private-samba.so
+@so lib/samba/libads-private-samba.so
+@so lib/samba/libasn1-private-samba.so
+@so lib/samba/libasn1util-private-samba.so
+@so lib/samba/libauth-private-samba.so
+@so lib/samba/libauth-unix-token-private-samba.so
+@so lib/samba/libauth4-private-samba.so
+@so lib/samba/libauthkrb5-private-samba.so
+@so lib/samba/libcli-cldap-private-samba.so
+@so lib/samba/libcli-ldap-common-private-samba.so
+@so lib/samba/libcli-ldap-private-samba.so
+@so lib/samba/libcli-nbt-private-samba.so
+@so lib/samba/libcli-smb-common-private-samba.so
+@so lib/samba/libcli-spoolss-private-samba.so
+@so lib/samba/libcliauth-private-samba.so
+@so lib/samba/libclidns-private-samba.so
+@so lib/samba/libcluster-private-samba.so
+@so lib/samba/libcmdline-contexts-private-samba.so
+@so lib/samba/libcmdline-private-samba.so
+@so lib/samba/libcom-err-private-samba.so
+@so lib/samba/libcommon-auth-private-samba.so
+@so lib/samba/libdbwrap-private-samba.so
+@so lib/samba/libdcerpc-pkt-auth-private-samba.so
+@so lib/samba/libdcerpc-samba-private-samba.so
+@so lib/samba/libdcerpc-samba4-private-samba.so
+@so lib/samba/libdnsserver-common-private-samba.so
+@so lib/samba/libdsdb-module-private-samba.so
+@so lib/samba/libevents-private-samba.so
+@so lib/samba/libflag-mapping-private-samba.so
+@so lib/samba/libgenrand-private-samba.so
+@so lib/samba/libgensec-private-samba.so
+@so lib/samba/libgpext-private-samba.so
+@so lib/samba/libgpo-private-samba.so
+@so lib/samba/libgse-private-samba.so
+@so lib/samba/libgss-preauth-private-samba.so
+@so lib/samba/libgssapi-private-samba.so
+@so lib/samba/libhcrypto-private-samba.so
+@so lib/samba/libhdb-private-samba.so
+@so lib/samba/libheimbase-private-samba.so
+@so lib/samba/libheimntlm-private-samba.so
+@so lib/samba/libhttp-private-samba.so
+@so lib/samba/libhx509-private-samba.so
+@so lib/samba/libidmap-private-samba.so
+@so lib/samba/libinterfaces-private-samba.so
+@so lib/samba/libiov-buf-private-samba.so
+@so lib/samba/libkdc-private-samba.so
+@so lib/samba/libkrb5-private-samba.so
+@so lib/samba/libkrb5samba-private-samba.so
+@so lib/samba/libldb-cmdline-private-samba.so
+@so lib/samba/libldb-key-value-private-samba.so
+@so lib/samba/libldb-tdb-err-map-private-samba.so
+@so lib/samba/libldb-tdb-int-private-samba.so
+@so lib/samba/libldbsamba-private-samba.so
+@so lib/samba/liblibcli-lsa3-private-samba.so
+@so lib/samba/liblibcli-netlogon3-private-samba.so
+@so lib/samba/liblibsmb-private-samba.so
+@so lib/samba/libmessages-dgm-private-samba.so
+@so lib/samba/libmessages-util-private-samba.so
+@so lib/samba/libmscat-private-samba.so
+@so lib/samba/libmsghdr-private-samba.so
+@so lib/samba/libmsrpc3-private-samba.so
+@so lib/samba/libndr-samba-private-samba.so
+@so lib/samba/libndr-samba4-private-samba.so
+@so lib/samba/libnet-keytab-private-samba.so
+@so lib/samba/libnetif-private-samba.so
+@so lib/samba/libnpa-tstream-private-samba.so
+@so lib/samba/libnss-info-private-samba.so
+@so lib/samba/libposix-eadb-private-samba.so
+@so lib/samba/libprinter-driver-private-samba.so
+@so lib/samba/libprinting-migrate-private-samba.so
+@so lib/samba/libregistry-private-samba.so
+@so lib/samba/libreplace-private-samba.so
+@so lib/samba/libroken-private-samba.so
+@so lib/samba/libsamba-cluster-support-private-samba.so
+@so lib/samba/libsamba-debug-private-samba.so
+@so lib/samba/libsamba-modules-private-samba.so
+@so lib/samba/libsamba-net.cpython-310-private-samba.so
+@so lib/samba/libsamba-python.cpython-310-private-samba.so
+@so lib/samba/libsamba-security-private-samba.so
+@so lib/samba/libsamba-sockets-private-samba.so
+@so lib/samba/libsamba3-util-private-samba.so
+@so lib/samba/libsamdb-common-private-samba.so
+@so lib/samba/libsecrets3-private-samba.so
+@so lib/samba/libserver-id-db-private-samba.so
+@so lib/samba/libserver-role-private-samba.so
+@so lib/samba/libshares-private-samba.so
+@so lib/samba/libsmb-transport-private-samba.so
+@so lib/samba/libsmbclient-raw-private-samba.so
+@so lib/samba/libsmbd-base-private-samba.so
+@so lib/samba/libsmbd-shim-private-samba.so
+@so lib/samba/libsmbldaphelper-private-samba.so
+@so lib/samba/libsmbpasswdparser-private-samba.so
+@so lib/samba/libsocket-blocking-private-samba.so
+@so lib/samba/libstable-sort-private-samba.so
+@so lib/samba/libsys-rw-private-samba.so
+@so lib/samba/libtalloc-report-printf-private-samba.so
+@so lib/samba/libtalloc-report-private-samba.so
+@so lib/samba/libtdb-wrap-private-samba.so
+@so lib/samba/libtime-basic-private-samba.so
+@so lib/samba/libtorture-private-samba.so
+@so lib/samba/libtrusts-util-private-samba.so
+@so lib/samba/libutil-reg-private-samba.so
+@so lib/samba/libutil-setid-private-samba.so
+@so lib/samba/libutil-tdb-private-samba.so
+@so lib/samba/libwind-private-samba.so
+@so lib/samba/libxattr-tdb-private-samba.so
 lib/samba/nss_info/
 @so lib/samba/nss_info/hash.so
 @so lib/samba/nss_info/rfc2307.so
@@ -1778,6 +1947,7 @@ libexec/samba/
 @man man/man1/smbtree.1
 @man man/man1/testparm.1
 @man man/man1/wbinfo.1
+@man man/man1/wspsearch.1
 @man man/man3/ldb.3
 @man man/man5/lmhosts.5
 @man man/man5/pam_winbind.conf.5
@@ -1859,6 +2029,7 @@ sbin/samba-gpupdate
 share/doc/pkg-readmes/${PKGSTEM}
 @comment share/doc/samba/
 share/examples/samba/
+share/examples/samba/scripts/debugging/smbXsrvdump
 share/examples/samba/smb.conf.default
 @sample ${SYSCONFDIR}/samba/smb.conf
 @mode 0750