Download raw body.
UPDATE net/samba-4.21.0
This is the first release of the 4.21 branch. Changes are listed in [0].
Changes to the port:
- Remove pyldb-util.cpython-${MODPY_MAJORMINOR} as API python bindings
have been removed from the LDB module [0].
- No need any more for special handling of
samba-policy.cpython-${MODPY_MAJORMINOR} as this is a normal C
library, used by python but does not use any python itself (nor by
dependencies any longer) [1].
- Bumped several shared libraries (based on output of check_sym).
The first two changes enable us to simplify Makefile.
I have been running the 4.21 branch since the first release candidate
and found no issues in my environment. Results may vary.
There is limited time to test this update before the ports tree is
locked. Not sure if there is enough time. Any opinion on this?
FWIW, the 4.20 branch we currently have in ports is supported until
2025-09 [2], thus well supported. Updating to 4.21 has a slight
advantage on backporting future updates.
Please note that this release of samba depends on an update of
databases/tdb to 1.4.12, which will be send in a separate mail.
Wait with updating / comments/ ok?
[0] https://www.samba.org/samba/history/samba-4.21.0.html
[1] https://github.com/samba-team/samba/commit/d11b281aefa98e6850053ccd6142253c6cf0d04f
[2] https://wiki.samba.org/index.php/Samba_Release_Planning
diff --git Makefile Makefile
index 3824cb19ee8..b4a3448447e 100644
--- Makefile
+++ Makefile
@@ -1,4 +1,4 @@
-VERSION = 4.20.4
+VERSION = 4.21.0
DISTNAME = samba-${VERSION}
EPOCH = 0
@@ -14,29 +14,26 @@ SHARED_LIBS = dcerpc 1.2 \
dcerpc-binding 5.0 \
dcerpc-samr 1.0 \
dcerpc-server-core 3.1 \
- ldb 2.3 \
+ ldb 2.4 \
ndr 3.2 \
ndr-krb5pac 1.3 \
ndr-nbt 2.1 \
ndr-standard 6.0 \
- netapi 3.3 \
- samba-credentials 1.6 \
+ netapi 3.4 \
+ samba-credentials 2.0 \
samba-errors 2.1 \
- samba-hostconfig 14.0 \
- samba-passdb 3.0 \
- samba-util 10.1 \
- samdb 3.1 \
+ samba-hostconfig 15.0 \
+ samba-passdb 3.1 \
+ samba-policy 0.0 \
+ samba-util 11.0 \
+ samdb 4.0 \
smbclient 6.2 \
- smbconf 15.0 \
+ smbconf 16.0 \
smbldap 1.0 \
tevent 2.3 \
tevent-util 2.0 \
wbclient 5.1
-# Those have to be handled specially, see "Python ABI" below.
-SHARED_LIBS += pyldb-util.cpython-${MODPY_MAJORMINOR} 1.0
-SHARED_LIBS += samba-policy.cpython-${MODPY_MAJORMINOR} 1.0
-
CATEGORIES = net sysutils security
HOMEPAGE = https://www.samba.org/
@@ -58,9 +55,6 @@ WANTLIB-docs =
SITES = https://download.samba.org/pub/samba/stable/ \
https://download.samba.org/pub/samba/old-versions/
-# XXX 0640 on Makefile breaks update-patches with PORTS_PRIVSEP=Yes
-FIX_EXTRACT_PERMISSIONS = Yes
-
MULTI_PACKAGES = -main -docs
DEBUG_PACKAGES = ${BUILD_PACKAGES}
@@ -84,7 +78,7 @@ RUN_DEPENDS-docs =
LIB_DEPENDS-main = archivers/libarchive \
converters/libiconv \
databases/openldap \
- databases/tdb>=1.4.10 \
+ databases/tdb>=1.4.12 \
devel/jansson \
devel/libinotify \
devel/libtalloc>=2.4.2 \
@@ -150,30 +144,6 @@ MAKE_ENV = LC_ALL=en_US.UTF-8 \
MAKE_ENV += LIB${_l:S/-/_/g}_VERSION=${_v}
.endfor
-## Python ABI
-# The samba project decided to also encode the python ABI name into shared
-# libraries that link against libpython. Our ports infrastructure barely
-# copes.
-
-# 1. Those shared libraries names contain a variable whose value is not yet
-# known by the time the .for loop runs
-MAKE_ENV += LIBpyldb_util_cpython_${MODPY_MAJORMINOR}_VERSION=${LIBpyldb-util.cpython-${MODPY_MAJORMINOR}_VERSION}
-MAKE_ENV += LIBsamba_policy_cpython_${MODPY_MAJORMINOR}_VERSION=${LIBsamba-policy.cpython-${MODPY_MAJORMINOR}_VERSION}
-
-# 2. Said libraries end up as such in pkg/PLIST-foo:
-# @lib lib/libbar.${MODPY_PYC_MAGIC_TAG}so.${LIBbar.cpython-XY_VERSION}
-# We don't want to hardcode the XY version number in the PLIST.
-PYLDB_UTIL_LIBSUFFIX = cpython-${MODPY_MAJORMINOR}.so.${LIBpyldb-util.cpython-${MODPY_MAJORMINOR}_VERSION}
-SUBST_VARS += PYLDB_UTIL_LIBSUFFIX
-SAMBA_POLICY_LIBSUFFIX= cpython-${MODPY_MAJORMINOR}.so.${LIBsamba-policy.cpython-${MODPY_MAJORMINOR}_VERSION}
-SUBST_VARS += SAMBA_POLICY_LIBSUFFIX
-
-# 3. Some samba python extension modules don't follow the same naming
-# pattern as the usual python extension modules.
-SAMBA_PYTHON_MAGIC_TAG= ${MODPY_PYC_MAGIC_TAG:S/./-samba4/}
-SUBST_VARS += SAMBA_PYTHON_MAGIC_TAG
-
-
SAMBA_CONFIG = ${PREFIX}/share/examples/samba/smb.conf.default
SAMBA_LOGDIR = ${VARBASE}/log/samba
diff --git distinfo distinfo
index 1d8169026e1..6ac462b8071 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.20.4.tar.gz) = OpLpfq6zRbazIjL1A+FNNPA6eqZMRR/owlihG72pCOU=
-SIZE (samba-4.20.4.tar.gz) = 42462586
+SHA256 (samba-4.21.0.tar.gz) = CbtW20zgA8r9vr6brTaMT0/xlF9zLRgHfVLzarIM74g=
+SIZE (samba-4.21.0.tar.gz) = 42625973
diff --git patches/patch-buildtools_wafsamba_samba_autoconf_py patches/patch-buildtools_wafsamba_samba_autoconf_py
index 2dd80dc9582..70e2342a55c 100644
--- patches/patch-buildtools_wafsamba_samba_autoconf_py
+++ 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
-@@ -942,6 +942,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
+@@ -954,6 +954,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
-@@ -1013,7 +1034,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
+@@ -1025,7 +1046,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
# symbols used for fuzzers are only defined by compiler wrappers.
return
diff --git patches/patch-buildtools_wafsamba_wafsamba_py patches/patch-buildtools_wafsamba_wafsamba_py
index d965abf1c5d..97c08f391d7 100644
--- patches/patch-buildtools_wafsamba_wafsamba_py
+++ patches/patch-buildtools_wafsamba_wafsamba_py
@@ -7,7 +7,7 @@
Index: buildtools/wafsamba/wafsamba.py
--- buildtools/wafsamba/wafsamba.py.orig
+++ buildtools/wafsamba/wafsamba.py
-@@ -289,6 +289,17 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -291,6 +291,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'))
-@@ -408,9 +419,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -410,9 +421,9 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None and not private_library:
if pyembed:
diff --git patches/patch-buildtools_wafsamba_wscript patches/patch-buildtools_wafsamba_wscript
index f7959df2bb5..e8629023ddb 100644
--- patches/patch-buildtools_wafsamba_wscript
+++ patches/patch-buildtools_wafsamba_wscript
@@ -3,7 +3,7 @@ Add a hack to force addition of -I/usr/include before any other include path dis
Index: buildtools/wafsamba/wscript
--- buildtools/wafsamba/wscript.orig
+++ buildtools/wafsamba/wscript
-@@ -145,6 +145,11 @@ Currently the only tested value is 'smbtorture,smbd/sm
+@@ -148,6 +148,11 @@ Currently the only tested value is 'smbtorture,smbd/sm
help=("Disable use of gettext"),
action="store_true", dest='disable_gettext', default=False)
diff --git patches/patch-lib_ldb_wscript patches/patch-lib_ldb_wscript
deleted file mode 100644
index 276572bbbe9..00000000000
--- patches/patch-lib_ldb_wscript
+++ /dev/null
@@ -1,25 +0,0 @@
-1. Force building standalone library (e.g., put headers in appropriate place).
-
-2. Use -Wl,no-undefined as on other platforms.
-
-Index: lib/ldb/wscript
---- lib/ldb/wscript.orig
-+++ lib/ldb/wscript
-@@ -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()
-+ conf.env.standalone_ldb = True
-
- if not conf.env.standalone_ldb:
- max_ldb_version = [int(x) for x in VERSION.split(".")]
-@@ -151,8 +152,7 @@ def configure(conf):
-
- # we don't want any libraries or modules to rely on runtime
- # resolution of symbols
-- if not sys.platform.startswith("openbsd"):
-- conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
-+ conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
-
- # if lmdb support is enabled then we require lmdb
- # is present, build the mdb back end and enable lmdb support in
diff --git patches/patch-lib_util_charset_wscript_configure patches/patch-lib_util_charset_wscript_configure
index ffbac905832..ff83a95c296 100644
--- patches/patch-lib_util_charset_wscript_configure
+++ patches/patch-lib_util_charset_wscript_configure
@@ -8,8 +8,8 @@ Index: lib/util/charset/wscript_configure
lib='iconv',
headers='errno.h iconv.h')
--if conf.CHECK_CFG(package='icu-i18n',
-+if False and conf.CHECK_CFG(package='icu-i18n',
+-if conf.CHECK_CFG(package='icu-i18n icu-uc',
++if False and conf.CHECK_CFG(package='icu-i18n icu-uc',
args='--cflags --libs',
- msg='Checking for icu-i18n',
- uselib_store='ICU_I18N'):
+ msg='Checking for icu-i18n icu-uc',
+ uselib_store='ICUI18N'):
diff --git patches/patch-python_samba_provision___init___py patches/patch-python_samba_provision___init___py
index 64dad49d37e..424104fc3a9 100644
--- patches/patch-python_samba_provision___init___py
+++ 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
-@@ -2201,7 +2201,7 @@ def provision(logger, session_info, smbconf=None,
+@@ -2206,7 +2206,7 @@ def provision(logger, session_info, smbconf=None,
root_gid = pwd.getpwuid(root_uid).pw_gid
try:
diff --git patches/patch-source3_wscript patches/patch-source3_wscript
index bf3e6c554f0..d5d8754a9c2 100644
--- patches/patch-source3_wscript
+++ patches/patch-source3_wscript
@@ -4,7 +4,7 @@
Index: source3/wscript
--- source3/wscript.orig
+++ source3/wscript
-@@ -101,6 +101,7 @@ def options(opt):
+@@ -96,6 +96,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)
@@ -12,7 +12,7 @@ Index: source3/wscript
def configure(conf):
default_static_modules = []
-@@ -109,7 +110,7 @@ def configure(conf):
+@@ -104,7 +105,7 @@ def configure(conf):
forced_static_modules = []
forced_shared_modules = []
@@ -21,7 +21,7 @@ Index: source3/wscript
conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
# We crash without vfs_default
-@@ -1799,7 +1800,7 @@ int main(void) {
+@@ -1732,7 +1733,7 @@ int main(void) {
else:
conf.fatal('AFS headers not available, but --with-fake-kaserver was specified')
diff --git patches/patch-source3_wscript_build patches/patch-source3_wscript_build
index c151ab5c9f9..2ca904cede7 100644
--- patches/patch-source3_wscript_build
+++ patches/patch-source3_wscript_build
@@ -4,7 +4,7 @@ interface used at least by pdbedit.
Index: source3/wscript_build
--- source3/wscript_build.orig
+++ source3/wscript_build
-@@ -134,7 +134,9 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma
+@@ -137,7 +137,9 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma
'!get_attr_list']
private_pdb_match.append('!pdb_nds_*')
private_pdb_match.append('!pdb_ldapsam_init*')
diff --git pkg/PLIST-main pkg/PLIST-main
index 65400a77f88..7b8ea905d43 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -117,7 +117,6 @@ include/samba-4.0/netapi.h
include/samba-4.0/param.h
include/samba-4.0/passdb.h
include/samba-4.0/policy.h
-include/samba-4.0/pyldb.h
include/samba-4.0/rpc_common.h
include/samba-4.0/samba/
include/samba-4.0/samba/session.h
@@ -161,14 +160,11 @@ include/samba-4.0/wbclient.h
@lib lib/libndr-standard.so.${LIBndr-standard_VERSION}
@lib lib/libndr.so.${LIBndr_VERSION}
@lib lib/libnetapi.so.${LIBnetapi_VERSION}
-@comment @lib lib/libpyldb-util.${PYLDB_UTIL_LIBSUFFIX}
-@lib lib/libpyldb-util.${PYLDB_UTIL_LIBSUFFIX}
@lib lib/libsamba-credentials.so.${LIBsamba-credentials_VERSION}
@lib lib/libsamba-errors.so.${LIBsamba-errors_VERSION}
@lib lib/libsamba-hostconfig.so.${LIBsamba-hostconfig_VERSION}
@lib lib/libsamba-passdb.so.${LIBsamba-passdb_VERSION}
-@comment @lib lib/libsamba-policy.${SAMBA_POLICY_LIBSUFFIX}
-@lib lib/libsamba-policy.${SAMBA_POLICY_LIBSUFFIX}
+@lib lib/libsamba-policy.so.${LIBsamba-policy_VERSION}
@lib lib/libsamba-util.so.${LIBsamba-util_VERSION}
@lib lib/libsamdb.so.${LIBsamdb_VERSION}
@lib lib/libsmbclient.so.${LIBsmbclient_VERSION}
@@ -185,10 +181,9 @@ lib/pkgconfig/ndr_krb5pac.pc
lib/pkgconfig/ndr_nbt.pc
lib/pkgconfig/ndr_standard.pc
lib/pkgconfig/netapi.pc
-lib/pkgconfig/pyldb-util.${MODPY_PYC_MAGIC_TAG}pc
lib/pkgconfig/samba-credentials.pc
lib/pkgconfig/samba-hostconfig.pc
-lib/pkgconfig/samba-policy.${MODPY_PYC_MAGIC_TAG}pc
+lib/pkgconfig/samba-policy.pc
lib/pkgconfig/samba-util.pc
lib/pkgconfig/samdb.pc
lib/pkgconfig/smbclient.pc
@@ -242,6 +237,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}join.${MODPY_PYC_
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}join.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}lsa_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}lsa_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}mdb_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}mdb_util.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}ms_display_specifiers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -276,8 +273,6 @@ lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}subnets.${MODPY_P
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}subnets.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}tdb_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}tdb_util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}trust_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}trust_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}upgrade.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}upgrade.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/${MODPY_PYCACHE}upgradehelpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -351,6 +346,79 @@ lib/python${MODPY_VERSION}/site-packages/samba/dcerpc/${MODPY_PYCACHE}__init__.$
lib/python${MODPY_VERSION}/site-packages/samba/descriptor.py
lib/python${MODPY_VERSION}/site-packages/samba/dnsresolver.py
lib/python${MODPY_VERSION}/site-packages/samba/dnsserver.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/
+lib/python${MODPY_VERSION}/site-packages/samba/domain/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/domain/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/domain/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}auth_policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}auth_policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}auth_silo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}auth_silo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}claim_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}claim_type.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}computer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}computer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}gmsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}gmsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}model.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}model.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}org.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}org.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}person.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}person.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}query.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}query.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}schema.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}schema.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}site.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}site.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}subnet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}subnet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}value_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/${MODPY_PYCACHE}value_type.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/auth_policy.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/auth_silo.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/claim_type.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/computer.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/constants.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/container.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/fields.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/gmsa.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/group.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/model.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/org.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/person.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/query.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/registry.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/schema.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/site.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/subnet.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/types.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/user.py
+lib/python${MODPY_VERSION}/site-packages/samba/domain/models/value_type.py
lib/python${MODPY_VERSION}/site-packages/samba/domain_update.py
lib/python${MODPY_VERSION}/site-packages/samba/drs_utils.py
@so lib/python${MODPY_VERSION}/site-packages/samba/dsdb.${MODPY_PYC_MAGIC_TAG}so
@@ -497,6 +565,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/kcc/graph_utils.py
lib/python${MODPY_VERSION}/site-packages/samba/kcc/kcc_utils.py
lib/python${MODPY_VERSION}/site-packages/samba/kcc/ldif_import_export.py
lib/python${MODPY_VERSION}/site-packages/samba/logger.py
+lib/python${MODPY_VERSION}/site-packages/samba/lsa_utils.py
lib/python${MODPY_VERSION}/site-packages/samba/mdb_util.py
@so lib/python${MODPY_VERSION}/site-packages/samba/messaging.${MODPY_PYC_MAGIC_TAG}so
lib/python${MODPY_VERSION}/site-packages/samba/ms_display_specifiers.py
@@ -620,15 +689,40 @@ lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/${MODPY_PYCACHE}silo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/${MODPY_PYCACHE}silo.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/${MODPY_PYCACHE}silo_member.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/${MODPY_PYCACHE}silo_member.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy.py
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo.py
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo_member.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}computer_allowed_to_authenticate_to.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}computer_allowed_to_authenticate_to.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}service_allowed_to_authenticate_from.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}service_allowed_to_authenticate_from.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}service_allowed_to_authenticate_to.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}service_allowed_to_authenticate_to.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}user_allowed_to_authenticate_from.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}user_allowed_to_authenticate_from.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}user_allowed_to_authenticate_to.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/${MODPY_PYCACHE}user_allowed_to_authenticate_to.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/computer_allowed_to_authenticate_to.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/policy.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_from.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_to.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_from.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_to.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/${MODPY_PYCACHE}member.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/${MODPY_PYCACHE}member.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/${MODPY_PYCACHE}silo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/${MODPY_PYCACHE}silo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/member.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/auth/silo/silo.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/backup.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/claim/
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/claim/__init__.py
@@ -648,53 +742,17 @@ lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/demote.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/functional_prep.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/info.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/join.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/kds/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/kds/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/kds/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/kds/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/kds/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/kds/${MODPY_PYCACHE}root_key.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/kds/${MODPY_PYCACHE}root_key.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/kds/root_key.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/keytab.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/leave.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/level.py
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}auth_policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}auth_policy.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}auth_silo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}auth_silo.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}claim_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}claim_type.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-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}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}site.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}subnet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}subnet.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}user.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}value_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/${MODPY_PYCACHE}value_type.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/auth_policy.py
-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
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/user.py
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/models/value_type.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/passwordsettings.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/provision.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/domain/samba3upgrade.py
@@ -718,6 +776,17 @@ 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/service_account/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/${MODPY_PYCACHE}group_msa_membership.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/${MODPY_PYCACHE}group_msa_membership.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/${MODPY_PYCACHE}service_account.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/${MODPY_PYCACHE}service_account.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/group_msa_membership.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/service_account/service_account.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
@@ -948,6 +1017,10 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_dns.${
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_dns.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_lock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_lock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_quiet_env_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_quiet_env_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_quiet_provision_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_quiet_provision_tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_schema_attributes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}dsdb_schema_attributes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/${MODPY_PYCACHE}encrypted_secrets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1163,6 +1236,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}cl
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}gmsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}gmsa.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_chunk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_chunk.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1205,6 +1280,7 @@ 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/gmsa.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_chunk.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_content.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/mdsearch.py
@@ -1244,14 +1320,14 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}bare
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}bare.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}binding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}binding.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}createtrustrelax.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}createtrustrelax.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}dnsserver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}dnsserver.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}integer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}integer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}lsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}lsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}lsa_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}lsa_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}mdssvc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}mdssvc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1281,10 +1357,10 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/${MODPY_PYCACHE}unix
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/array.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/bare.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/binding.py
-lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/createtrustrelax.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/dnsserver.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/integer.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/lsa.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/lsa_utils.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/mdssvc.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/misc.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/raw_protocol.py
@@ -1319,6 +1395,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/dsdb.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dsdb_api.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dsdb_dns.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dsdb_lock.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dsdb_quiet_env_tests.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dsdb_quiet_provision_tests.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dsdb_schema_attributes.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/emulate/
lib/python${MODPY_VERSION}/site-packages/samba/tests/emulate/__init__.py
@@ -1387,6 +1465,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}fast_t
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}gmsa_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}gmsa_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}
@@ -1457,6 +1537,7 @@ 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/gmsa_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
@@ -1571,6 +1652,8 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_auth_silo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_claim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_claim.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_kds_root_key.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_kds_root_key.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_models.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}domain_models.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}drs_clone_dc_data_lmdb_size.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1615,6 +1698,8 @@ 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}service_account.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/${MODPY_PYCACHE}service_account.${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}
@@ -1655,6 +1740,7 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/dnscmd.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
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/domain_kds_root_key.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/domain_models.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/dsacl.py
@@ -1677,6 +1763,7 @@ 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/service_account.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
@@ -1721,7 +1808,6 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/upgradeprovision.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/upgradeprovisionneeddc.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/usage.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/xattr.py
-lib/python${MODPY_VERSION}/site-packages/samba/trust_utils.py
lib/python${MODPY_VERSION}/site-packages/samba/upgrade.py
lib/python${MODPY_VERSION}/site-packages/samba/upgradehelpers.py
lib/python${MODPY_VERSION}/site-packages/samba/uptodateness.py
@@ -1831,13 +1917,15 @@ lib/samba/ldb/
@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/libpyldb-util.cpython-311-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-311-private-samba.so
+@so lib/samba/libsamba-net-join.cpython-311-private-samba.so
+@so lib/samba/libsamba-net-private-samba.so
@so lib/samba/libsamba-python.cpython-311-private-samba.so
@so lib/samba/libsamba-security-private-samba.so
@so lib/samba/libsamba-sockets-private-samba.so
@@ -1861,7 +1949,6 @@ lib/samba/ldb/
@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
UPDATE net/samba-4.21.0