[v2] samba: Update to version 4.21.0

Message ID 20240921110646.1927-1-adolf.belka@ipfire.org
State Staged
Commit f7d6648e762554df73742a51bfcbb04ad6689f61
Headers
Series [v2] samba: Update to version 4.21.0 |

Commit Message

Adolf Belka Sept. 21, 2024, 11:06 a.m. UTC
  - Update from 4.20.4 to 4.21.0
- Update of rootfile for x86_64, aarch64 & riscv64
- Changelog
    4.21.0
	Hardening of "valid users", "invalid users", "read list" and "write list"
	 In previous versions of Samba, if a user or group name in either of the
	  mentioned options could not be resolved to a valid SID, the user (or group)
	  would be skipped without any notification. This could result in unexpected and
	  insecure behaviour. Starting with this version of Samba, if any user or group
	  name in any of the options cannot be resolved due to a communication error with
	  a domain controller, Samba will log an error and the tree connect will fail.
	 Non existing users (or groups) are ignored.
	LDAP TLS/SASL channel binding support
	 The ldap server supports SASL binds with
	  kerberos or NTLMSSP over TLS connections
	  now (either ldaps or starttls).
	 Setups where 'ldap server require strong auth = allow_sasl_over_tls'
	  was required before, can now most likely move to the
	  default of 'ldap server require strong auth = yes'.
	 If SASL binds without correct tls channel bindings are required
	  'ldap server require strong auth = allow_sasl_without_tls_channel_bindings'
	  should be used now, as 'allow_sasl_over_tls' will generate a
	  warning in every start of 'samba', as well as '[samba-tool ]testparm'.
	 This is similar to LdapEnforceChannelBinding under
	  HKLM\SYSTEM\CurrentControlSet\Services\NTDS\Parameters
	  on Windows.
	 All client tools using ldaps also include the correct
	  channel bindings now.
	NEW FEATURES/CHANGES
	LDB no longer a standalone tarball
	 LDB, Samba's LDAP-like local database and the power behind the Samba
	  AD DC, is no longer available to build as a distinct tarball, but is
	  instead provided as an optional public library.
	 If you need ldb as a public library, say to build sssd, then use
	   ./configure --private-libraries='!ldb'
	 This re-integration allows LDB tests to use the Samba's full selftest
	  system, including our knownfail infrastructure, and decreases the work
	  required during security releases as a coordinated release of the ldb
	  tarball is not also required.
	 This approach has been demonstrated already in Debian, which is already
	  building Samba and LDB is this way.
	 As part of this work, the pyldb-util public library, not known to be
	  used by any other software, is made private to Samba.
	LDB Module API Python bindings removed
	 The LDB Modules API, which we do not promise a stable ABI or API for,
	  was wrapped in python in early LDB development.  However that wrapping
	  never took into account later changes, and so has not worked for a
	  number of years.  Samba 4.21 and LDB 2.10 removes this unused and
	  broken feature.
	Changes in LDB handling of Unicode
	 Developers using LDB up to version 2.9 could call ldb_set_utf8_fns()
	  to determine how LDB handled casefolding. This is used internally by
	  string comparison functions. In LDB 2.10 this function is deprecated,
	  and ldb_set_utf8_functions() is preferred. The new function allows a
	  direct comparison function to be set as well as a casefold function.
	 This improves performance and allows for more robust handling of
	  degenerate cases. The function should be called just after ldb_init(),
	  with the following arguments:
	     ldb_set_utf8_functions(ldb, /* the struct ldb_ctx LDB object */
	                            context_variable /* possibly NULL */
	                            casefold_function,
	                            case_insensitive_comparison_function);
	 The default behaviour of LDB remains to perform ASCII casefolding
	  only, as if in the "C" locale. Recent versions have become
	  increasingly consistent in this.
	Some Samba public libraries made private by default
	 The following Samba C libraries are currently made public due to their
	  use by OpenChange or for historical reasons that are no longer clear.
	    dcerpc-samr, samba-policy, tevent-util, dcerpc, samba-hostconfig,
	    samba-credentials, dcerpc_server, samdb
	 The libraries used by the OpenChange client now private, but can be
	  made public (like ldb above) with:
	   ./configure --private-libraries='!dcerpc,!samba-hostconfig,!samba-credentials,!ldb'
	 The C libraries without any known user or used only for the OpenChange
	  server (a dead project) may be made private entirely in a future Samba
	  version.
	 If you use a Samba library in this list, please be in touch with the
	  samba-technical mailing list.
	Using ldaps from 'winbindd' and 'net ads'
	 Beginning with Samba 3.0.22 the 'ldap ssl = start tls' option also
	  impacted LDAP connections to active directory domain controllers.
	 Using the STARTTLS operation on LDAP port 389 connections. Starting
	  with Samba 3.5.0 'ldap ssl ads = yes' was required in addition in
	  order let to 'ldap ssl = start tls' have any effect on those
	  connections.
	 'ldap ssl ads' was deprecated with Samba 4.8.0 and removed together
	  with the whole functionality in Samba 4.14.0, because it didn't support
	  tls channel bindings required for the sasl authentication.
	 The functionality is now re-added using the correct channel bindings
	  based on the gnutls based tls implementation we already have, instead
	  of using the tls layer provided by openldap. This makes it available
	  and consistent with all LDAP client libraries we use and implement on
	  our own.
	 The 'client ldap sasl wrapping' option gained the two new possible values:
	  'starttls' (using STARTTLS on tcp port 389)
	  and
	  'ldaps' (using TLS directly on tcp port 636).
	 If you had 'ldap ssl = start tls' and 'ldap ssl ads = yes'
	  before, you can now use 'client ldap sasl wrapping = starttls'
	  in order to get STARTTLS on tcp port 389.
	 As we no longer use the openldap tls layer it is required to configure the
	  correct certificate trusts with at least one of the following options:
	  'tls trust system cas', 'tls ca directories' or 'tls cafile'.
	 While 'tls verify peer' and 'tls crlfile' are also relevant,
	  see 'man smb.conf' for further details.
	New DNS hostname config option
	 To get `net ads dns register` working correctly running manually or during a
	  domain join a special entry in /etc/hosts was required. This not really
	  documented and thus the DNS registration mostly didn't work. With the new option
	  the default is [netbios name].[realm] which should be correct in the majority of
	  use cases.
	 We will also use the value to create service principal names during a Kerberos
	  authentication and DNS functions.
	 This is not supported in samba-tool yet.
	Samba AD will rotate expired passwords on smartcard-required accounts
	 Traditionally in AD, accounts set to be "smart card require for logon"
	  will have a password for NTLM fallback and local profile encryption
	  (Windows DPAPI). This password previously would not expire.
	 Matching Windows behaviour, when the DC in a FL 2016 domain and the
	  msDS-ExpirePasswordsOnSmartCardOnlyAccounts attribute on the domain
	  root is set to TRUE, Samba will now expire these passwords and rotate
	  them shortly before they expire.
	 Note that the password expiry time must be set to twice the TGT lifetime for
	  smooth operation, e.g. daily expiry given a default 10 hour TGT
	  lifetime, as the password is only rotated in the second half of its
	  life.  Again, this matches the Windows behaviour.
	 Provided the default 2016 schema is used, new Samba domains
	  provisioned with Samba 4.21 will have this enabled once the domain
	  functional level is set to 2016.
	 NOTE: Domains upgraded from older Samba versions will not have this
	  set, even after the functional level preparation, matching the
	  behaviour of upgraded Windows AD domains.
	Per-user and group "veto files" and "hide files"
	 "veto files" and "hide files" can optionally be restricted to certain users and
	  groups. To apply a veto or hide directive to a filename for a specific user or
	  group, a parametric option like this can be used:
	   hide files : USERNAME = /somefile.txt/
	   veto files : GROUPNAME = /otherfile.txt/
	  For details consult the updated smb.conf manpage.
	Automatic keytab update after machine password change
	 When machine account password is updated, either by winbind doing regular
	  updates or manually (e.g. net ads changetrustpw), now winbind will also support
	  update of keytab entries in case you use newly added option
	  'sync machine password to keytab'.
	  The new parameter allows you to describe what keytabs and how should be updated.
	  From smb.conf(5) manpage - each keytab can have exactly one of these four forms:
	                 account_name
	                 sync_spns
	                 spn_prefixes=value1[,value2[...]]
	                 spns=value1[,value2[...]]
	 The functionaity provided by the removed commands "net ads keytab
	  add/delete/add_update_ads" can be achieved via the 'sync machine password to
	  keytab' as in these examples:
	  "net ads keytab add  wurst/brot@REALM"
	    - this command is not adding <principal> to AD, so the best fit can be specifier
	      "spns"
	    - add to smb.conf:
	      sync machine password to keytab = /path/to/keytab1:spns=wurst/brot@REALM:machine_password
	    - run:
	      "net ads keytab create"
	  "net ads keytab delete wurst/brot@REALM"
	    - remove the principal (or the whole keytab line if there was just one)
	    - run:
	      "net ads keytab create"
	  "net ads keytab add_update_ads wurst/brot@REALM"
	    - this command was adding the principal to AD, so for this case use a keytab
	      with specifier sync_spns
	    - add to smb.conf:
	      sync machine password to keytab = /path/to/keytab2:sync_spns:machine_password
	    - run:
	      "net ads setspn add  wurst/brot@REALM"  # this adds the principal to AD
	      "net ads keytab create"  # this sync it from AD to local keytab
	 A new parameter 'sync machine password script' allows to specify external script
	  that will be triggered after the automatic keytab update. If keytabs should be
	  generated in clustered environments it is recommended to update them on all
	  nodes.  Check in smb.conf(5) the scripts winbind_ctdb_updatekeytab.sh and
	  46.update-keytabs.script in section 'sync machine password script' for details.
	 For detailed information check the smb.conf(5) and net(8) manpages.
	New cephfs VFS module
	 Introduce new vfs-to-cephfs bridge which uses libcephfs low-level APIs (instead
	  of path-based operations in the existing module). It allows users to pass
	  explicit user-credentials per call (including supplementary groups), as well as
	  faster operations using inode and file-handle caching on the Samba side.
	  Configuration is identical to existing module, but using 'ceph_new' instead of
	  'ceph' for the relevant smb.conf entries. This new module is expected to
	  deprecate and replace the old one in next major release.
	Group Managed Service Accounts
	 Samba 4.21 adds support for gMSAs (Group Managed Service Accounts),
	  completing support for Functional Level 2012.
	 The purpose of a gMSA is to allow a single host, or a cluster of
	  hosts, to share access to an automatically rotating password, avoiding
	  the weak static service passwords that are often the entrypoint of
	  attackers to AD domains. Each server has a strong and regularly
	  rotated password, which is used to access the gMSA account of (e.g.)
	  the database server.
	 Samba provides management and client tools, allowing services on Unix
	  hosts to access the current and next gMSA passwords, as well as obtain
	  a credentials cache.
	 Samba 4.20 announced the client-side tools for this feature. To avoid
	  duplication and provide consistency, the existing commands for
	  password viewing have been extended, so these commands operate both on
	  a gMSA (with credentials, over LDAP, specify -H) and locally for
	  accounts that have a compatible password (e.g. plaintext via GPG,
	  compatible hash)
	    samba-tool user getpassword
	    samba-tool user get-kerberos-ticket
	    samba-tool domain exportkeytab
	 An example command, which gets the NT hash for use with NTLM, is
	   samba-tool user getpassword -H ldap://server --machine-pass  \
	       TestUser1 --attributes=unicodePwd
	 Kerberos is a better choice (gMSA accounts should not use LDAP simple
	  binds, for reasons of both security and compatibility). Use
	   samba-tool user get-kerberos-ticket -H ldap://server --machine-pass \
	       TestUser1 --output-krb5-ccache=/srv/service/krb5_ccache
	 gMSAs disclose a current and previous password. To access the previous
	  NT hash, use:
	   samba-tool user getpassword -H ldap://server --machine-pass TestUser1 \
	      --attrs=unicodePwd;previous=1
	 To access the previous password as UTF8, use:
	   samba-tool user getpassword -H ldap://server --machine-pass TestUser1 \
	       --attributes=pwdLastSet,virtualClearTextUTF8;previous=1
	 However, Windows tools for dealing with gMSAs tend to use Active
	  Directory Web Services (ADWS) from Powershell for setting up the
	  accounts, and this separate protocol is not supported by Samba 4.21.
	 Samba-tool commands for handling gMSA (KDS) root keys
	   Group managed service accounts rotate passwords based on root keys,
	    which can be managed using samba-tool, with commands such as
	      samba-tool domain kds root_key create
	      samba-tool domain kds root_key list
	 Samba will create a new root key for new domains at provision time,
	  but users of gMSA accounts on upgraded domains will need to first
	  create a root key.
	RFC 8070 PKINIT "Freshness extension" supported in the Heimdal KDC
	 The Heimdal KDC will recognise when a client provides proof that they
	  hold the hardware token used for smart-card authentication 'now' and
	  has not used a saved future-dated reply. Samba 4.21 now matches
	  Windows and will assign an extra SID to the user in this case,
	  allowing sensitive resources to be additionally protected.
	 Only Windows clients are known to support the client side of this
	  feature at this time.
	New samba-tool Authentication Policy management command structure
	 As foreshadowed in the Samba 4.20 release notes, the "samba-tool
	  domain auth policy" commands have been reworked to be more intuitive
	  based on user feedback and reflection.
	Support for key features of AD Domain/Forest Functional Level 2012R2
	 Combined with other changes in recent versions (such as claims support
	  in 4.20), Samba can now claim Functional Level 2012R2 support.
	Build system
	 In previous versions of Samba, packagers of Samba would set their
	  package-specific version strings using a patch to the
	  SAMBA_VERSION_VENDOR_SUFFIX line in the ./VERSION file. Now that is
	  achieved by using --vendor-suffix (at configure time), allowing this
	  to be more easily scripted. Vendors are encouraged to include their
	  name and full package version to assist with upstream debugging.
	More deterministic builds
	 Samba builds are now more reproducible, providing better assurance
	  that the Samba binaries you run are the same as what is expected from
	  the source code. If locale settings are not changed, the same objects
	  will be produced from each compilation run. If Samba is built in a
	  different path, the object code will remain the same, but DWARF
	  debugging sections will change (while remaining functionally
	  equivalent).
	Improved command-line redaction
	 There are several options that can be used with Samba tools for
	  specifying secrets. Although this is best avoided, when these options
	  are used, Samba will redact the secrets in /proc, so that they won't
	  be seen in ps or top. This is now carried out more thoroughly,
	  redacting more options. There is a race inherent in this, and the
	  passwords will be visible for a short time. The secrets are also not
	  removed from .bash_history and similar files.
	REMOVED FEATURES
	Following commands are removed:
		net ads keytab add <principal>
		net ads keytab delete <principal>
		net ads keytab add_update_ads
	Changes
	smb.conf changes
	  Parameter Name                          Description     Default
	  --------------                          -----------     -------
	  client ldap sasl wrapping               new values
	  client use spnego principal             removed
	  ldap server require strong auth         new values
	  tls trust system cas                    new
	  tls ca directories                      new
	  dns hostname                            client dns name [netbios name].[realm]
	  valid users                             Hardening
	  invalid users                           Hardening
	  read list                               Hardening
	  write list                              Hardening
	  veto files                              Added per-user and per-group vetos
	  hide files                              Added per-user and per-group hides
	  sync machine password to keytab         keytabs
	  sync machine password script            script
	CHANGES SINCE 4.21.0rc4
	   * BUG 15699: Incorrect FSCTL_QUERY_ALLOCATED_RANGES response when truncated.
	   * BUG 15702: Bad variable definition for ParseTuple causing test failure for
	     Smb3UnixTests.test_create_context_reparse.
	   * BUG 15686: Add new vfs_ceph module (based on low level API).
	CHANGES SINCE 4.21.0rc3
	   * BUG 15698: samba-tool can not load the default configuration file.
	   * BUG 15700: Crash when readlinkat fails.
	CHANGES SINCE 4.21.0rc2
	   * BUG 15689: Can't add/delete special keys to keytab for nfs, cifs, http etc.
	   * BUG 15696: Compound SMB2 requests don't return
	     NT_STATUS_NETWORK_SESSION_EXPIRED for all requests, confuses
	     MacOSX clients.
	   * BUG 15689: Can't add/delete special keys to keytab for nfs, cifs, http etc.
	CHANGES SINCE 4.21.0rc1
	   * BUG 15673: --version-* options are still not ergonomic, and they reject
	     tilde characters.
	   * BUG 15686: Add new vfs_ceph module (based on low level API)
	   * BUG 15673: --version-* options are still not ergonomic, and they reject
	     tilde characters.
	   * BUG 15690: ldb_version.h is missing from ldb public library
	   * BUG 15689: Can not add/delete special keys to keytab for nfs, cifs, http etc
	   * BUG 15686: Add new vfs_ceph module (based on low level API)
	   * BUG 15673: --version-* options are still not ergonomic, and they reject
	     tilde characters.
	   * BUG 15687: undefined reference to winbind_lookup_name_ex
	   * BUG 15688: per user veto and hide file syntax is to complex
	   * BUG 15689: Can not add/delete special keys to keytab for nfs, cifs, http etc
	   * BUG 15688: per user veto and hide file syntax is to complex

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/packages/aarch64/samba | 131 ++++++++++++-----------
 config/rootfiles/packages/riscv64/samba | 127 +++++++++++-----------
 config/rootfiles/packages/x86_64/samba  | 133 ++++++++++++------------
 lfs/samba                               |   6 +-
 4 files changed, 206 insertions(+), 191 deletions(-)
  

Patch

diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index 82ad93a90..cb7407504 100644
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -57,8 +57,6 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/core/ntstatus_gen.h
 #usr/include/samba-4.0/core/werror.h
 #usr/include/samba-4.0/core/werror_gen.h
-#usr/include/samba-4.0/credentials.h
-#usr/include/samba-4.0/dcerpc.h
 #usr/include/samba-4.0/dcesrv_core.h
 #usr/include/samba-4.0/domain_credentials.h
 #usr/include/samba-4.0/gen_ndr
@@ -80,7 +78,6 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/gen_ndr/ndr_misc.h
 #usr/include/samba-4.0/gen_ndr/ndr_nbt.h
 #usr/include/samba-4.0/gen_ndr/ndr_samr.h
-#usr/include/samba-4.0/gen_ndr/ndr_samr_c.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl_c.h
 #usr/include/samba-4.0/gen_ndr/netlogon.h
@@ -101,9 +98,7 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/ndr/ndr_nbt.h
 #usr/include/samba-4.0/ndr/ndr_svcctl.h
 #usr/include/samba-4.0/netapi.h
-#usr/include/samba-4.0/param.h
 #usr/include/samba-4.0/passdb.h
-#usr/include/samba-4.0/policy.h
 #usr/include/samba-4.0/rpc_common.h
 #usr/include/samba-4.0/samba
 #usr/include/samba-4.0/samba/session.h
@@ -129,9 +124,6 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/util/idtree_random.h
 #usr/include/samba-4.0/util/signal.h
 #usr/include/samba-4.0/util/substitute.h
-#usr/include/samba-4.0/util/tevent_ntstatus.h
-#usr/include/samba-4.0/util/tevent_unix.h
-#usr/include/samba-4.0/util/tevent_werror.h
 #usr/include/samba-4.0/util/tfork.h
 #usr/include/samba-4.0/util/time.h
 #usr/include/samba-4.0/util_ldb.h
@@ -139,15 +131,9 @@  usr/bin/wspsearch
 usr/lib/libdcerpc-binding.so
 usr/lib/libdcerpc-binding.so.0
 usr/lib/libdcerpc-binding.so.0.0.1
-usr/lib/libdcerpc-samr.so
-usr/lib/libdcerpc-samr.so.0
-usr/lib/libdcerpc-samr.so.0.0.1
 usr/lib/libdcerpc-server-core.so
 usr/lib/libdcerpc-server-core.so.0
 usr/lib/libdcerpc-server-core.so.0.0.1
-usr/lib/libdcerpc.so
-usr/lib/libdcerpc.so.0
-usr/lib/libdcerpc.so.0.0.1
 usr/lib/libndr-krb5pac.so
 usr/lib/libndr-krb5pac.so.0
 usr/lib/libndr-krb5pac.so.0.0.1
@@ -158,34 +144,22 @@  usr/lib/libndr-standard.so
 usr/lib/libndr-standard.so.0
 usr/lib/libndr-standard.so.0.0.1
 usr/lib/libndr.so
-usr/lib/libndr.so.4
-usr/lib/libndr.so.4.0.0
+usr/lib/libndr.so.5
+usr/lib/libndr.so.5.0.0
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.1
 usr/lib/libnetapi.so.1.0.0
 usr/lib/libnss_winbind.so.2
 usr/lib/libnss_wins.so.2
-usr/lib/libsamba-credentials.so
-usr/lib/libsamba-credentials.so.1
-usr/lib/libsamba-credentials.so.1.0.0
 usr/lib/libsamba-errors.so
 usr/lib/libsamba-errors.so.1
 usr/lib/libsamba-errors.so.1.0.0
-usr/lib/libsamba-hostconfig.so
-usr/lib/libsamba-hostconfig.so.0
-usr/lib/libsamba-hostconfig.so.0.0.1
 usr/lib/libsamba-passdb.so
 usr/lib/libsamba-passdb.so.0
-usr/lib/libsamba-passdb.so.0.28.0
-usr/lib/libsamba-policy.cpython-310-aarch64-linux-gnu.so
-usr/lib/libsamba-policy.cpython-310-aarch64-linux-gnu.so.0
-usr/lib/libsamba-policy.cpython-310-aarch64-linux-gnu.so.0.0.1
+usr/lib/libsamba-passdb.so.0.29.0
 usr/lib/libsamba-util.so
 usr/lib/libsamba-util.so.0
 usr/lib/libsamba-util.so.0.0.1
-usr/lib/libsamdb.so
-usr/lib/libsamdb.so.0
-usr/lib/libsamdb.so.0.0.1
 usr/lib/libsmbclient.so
 usr/lib/libsmbclient.so.0
 usr/lib/libsmbclient.so.0.8.0
@@ -195,24 +169,15 @@  usr/lib/libsmbconf.so.0.0.1
 usr/lib/libsmbldap.so
 usr/lib/libsmbldap.so.2
 usr/lib/libsmbldap.so.2.1.0
-usr/lib/libtevent-util.so
-usr/lib/libtevent-util.so.0
-usr/lib/libtevent-util.so.0.0.1
 usr/lib/libwbclient.so
 usr/lib/libwbclient.so.0
 usr/lib/libwbclient.so.0.16
-#usr/lib/pkgconfig/dcerpc.pc
-#usr/lib/pkgconfig/dcerpc_samr.pc
 #usr/lib/pkgconfig/ndr.pc
 #usr/lib/pkgconfig/ndr_krb5pac.pc
 #usr/lib/pkgconfig/ndr_nbt.pc
 #usr/lib/pkgconfig/ndr_standard.pc
 #usr/lib/pkgconfig/netapi.pc
-#usr/lib/pkgconfig/samba-credentials.pc
-#usr/lib/pkgconfig/samba-hostconfig.pc
-#usr/lib/pkgconfig/samba-policy.cpython-310-aarch64-linux-gnu.pc
 #usr/lib/pkgconfig/samba-util.pc
-#usr/lib/pkgconfig/samdb.pc
 #usr/lib/pkgconfig/smbclient.pc
 #usr/lib/pkgconfig/wbclient.pc
 usr/lib/python3.10/site-packages/_ldb_text.py
@@ -283,6 +248,31 @@  usr/lib/python3.10/site-packages/samba/dcerpc/xattr.cpython-310-aarch64-linux-gn
 usr/lib/python3.10/site-packages/samba/descriptor.py
 usr/lib/python3.10/site-packages/samba/dnsresolver.py
 usr/lib/python3.10/site-packages/samba/dnsserver.py
+#usr/lib/python3.10/site-packages/samba/domain
+usr/lib/python3.10/site-packages/samba/domain/__init__.py
+#usr/lib/python3.10/site-packages/samba/domain/models
+usr/lib/python3.10/site-packages/samba/domain/models/__init__.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_policy.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_silo.py
+usr/lib/python3.10/site-packages/samba/domain/models/claim_type.py
+usr/lib/python3.10/site-packages/samba/domain/models/computer.py
+usr/lib/python3.10/site-packages/samba/domain/models/constants.py
+usr/lib/python3.10/site-packages/samba/domain/models/container.py
+usr/lib/python3.10/site-packages/samba/domain/models/exceptions.py
+usr/lib/python3.10/site-packages/samba/domain/models/fields.py
+usr/lib/python3.10/site-packages/samba/domain/models/gmsa.py
+usr/lib/python3.10/site-packages/samba/domain/models/group.py
+usr/lib/python3.10/site-packages/samba/domain/models/model.py
+usr/lib/python3.10/site-packages/samba/domain/models/org.py
+usr/lib/python3.10/site-packages/samba/domain/models/person.py
+usr/lib/python3.10/site-packages/samba/domain/models/query.py
+usr/lib/python3.10/site-packages/samba/domain/models/registry.py
+usr/lib/python3.10/site-packages/samba/domain/models/schema.py
+usr/lib/python3.10/site-packages/samba/domain/models/site.py
+usr/lib/python3.10/site-packages/samba/domain/models/subnet.py
+usr/lib/python3.10/site-packages/samba/domain/models/types.py
+usr/lib/python3.10/site-packages/samba/domain/models/user.py
+usr/lib/python3.10/site-packages/samba/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/domain_update.py
 usr/lib/python3.10/site-packages/samba/drs_utils.py
 usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-aarch64-linux-gnu.so
@@ -344,6 +334,7 @@  usr/lib/python3.10/site-packages/samba/kcc/graph_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/kcc_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/ldif_import_export.py
 usr/lib/python3.10/site-packages/samba/logger.py
+usr/lib/python3.10/site-packages/samba/lsa_utils.py
 usr/lib/python3.10/site-packages/samba/mdb_util.py
 usr/lib/python3.10/site-packages/samba/messaging.cpython-310-aarch64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/ms_display_specifiers.py
@@ -366,9 +357,18 @@  usr/lib/python3.10/site-packages/samba/netcmd/domain
 usr/lib/python3.10/site-packages/samba/netcmd/domain/__init__.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo_member.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/computer_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/policy.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_to.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/member.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/silo.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/backup.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim/__init__.py
@@ -381,24 +381,12 @@  usr/lib/python3.10/site-packages/samba/netcmd/domain/demote.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/functional_prep.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/info.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/join.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/kds
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/root_key.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/keytab.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/leave.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/level.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/claim_type.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/exceptions.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/fields.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/group.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/model.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/query.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/schema.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/site.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/subnet.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/user.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/passwordsettings.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/provision.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/samba3upgrade.py
@@ -422,6 +410,10 @@  usr/lib/python3.10/site-packages/samba/netcmd/processes.py
 usr/lib/python3.10/site-packages/samba/netcmd/pso.py
 usr/lib/python3.10/site-packages/samba/netcmd/rodc.py
 usr/lib/python3.10/site-packages/samba/netcmd/schema.py
+#usr/lib/python3.10/site-packages/samba/netcmd/service_account
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/group_msa_membership.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/service_account.py
 usr/lib/python3.10/site-packages/samba/netcmd/shell.py
 usr/lib/python3.10/site-packages/samba/netcmd/sites.py
 usr/lib/python3.10/site-packages/samba/netcmd/spn.py
@@ -513,10 +505,11 @@  usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/__init__.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/bug13653.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/check_output.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/downgradedatabase.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/gmsa.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/mdsearch.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/misc_dfs_widelink.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/ndrdump.py
@@ -548,10 +541,10 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/array.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/bare.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/binding.py
-#usr/lib/python3.10/site-packages/samba/tests/dcerpc/createtrustrelax.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/dnsserver.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/integer.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa.py
+#usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa_utils.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/mdssvc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/misc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/raw_protocol.py
@@ -583,6 +576,8 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_api.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_dns.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_lock.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_env_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_provision_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_schema_attributes.py
 #usr/lib/python3.10/site-packages/samba/tests/emulate
 #usr/lib/python3.10/site-packages/samba/tests/emulate/__init__.py
@@ -620,6 +615,7 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/etype_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/fast_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/gkdi_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/krb5/gmsa_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/group_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kcrypto.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py
@@ -716,6 +712,7 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_policy.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_silo.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_claim.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_kds_root_key.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_models.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/dsacl.py
@@ -738,6 +735,7 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/provision_userPassword_crypt.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/rodc.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/schema.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/service_account.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/silo_base.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/sites.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/timecmd.py
@@ -782,7 +780,6 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/upgradeprovisionneeddc.py
 #usr/lib/python3.10/site-packages/samba/tests/usage.py
 #usr/lib/python3.10/site-packages/samba/tests/xattr.py
-usr/lib/python3.10/site-packages/samba/trust_utils.py
 usr/lib/python3.10/site-packages/samba/upgrade.py
 usr/lib/python3.10/site-packages/samba/upgradehelpers.py
 usr/lib/python3.10/site-packages/samba/uptodateness.py
@@ -808,6 +805,7 @@  usr/lib/samba/krb5/winbind_krb5_locator.so
 #usr/lib/samba/ldb
 usr/lib/samba/ldb/asq.so
 usr/lib/samba/ldb/ildap.so
+usr/lib/samba/ldb/ldap.so
 usr/lib/samba/ldb/ldb.so
 usr/lib/samba/ldb/ldbsamba_extensions.so
 usr/lib/samba/ldb/paged_searches.so
@@ -847,8 +845,10 @@  usr/lib/samba/libcom-err-private-samba.so
 usr/lib/samba/libcommon-auth-private-samba.so
 usr/lib/samba/libdbwrap-private-samba.so
 usr/lib/samba/libdcerpc-pkt-auth-private-samba.so
+usr/lib/samba/libdcerpc-private-samba.so
 usr/lib/samba/libdcerpc-samba-private-samba.so
 usr/lib/samba/libdcerpc-samba4-private-samba.so
+usr/lib/samba/libdcerpc-samr-private-samba.so
 usr/lib/samba/libdnsserver-common-private-samba.so
 usr/lib/samba/libdsdb-module-private-samba.so
 usr/lib/samba/libevents-private-samba.so
@@ -901,14 +901,19 @@  usr/lib/samba/libregistry-private-samba.so
 usr/lib/samba/libreplace-private-samba.so
 usr/lib/samba/libroken-private-samba.so
 usr/lib/samba/libsamba-cluster-support-private-samba.so
+usr/lib/samba/libsamba-credentials-private-samba.so
 usr/lib/samba/libsamba-debug-private-samba.so
+usr/lib/samba/libsamba-hostconfig-private-samba.so
 usr/lib/samba/libsamba-modules-private-samba.so
-usr/lib/samba/libsamba-net.cpython-310-aarch64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-join.cpython-310-aarch64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-private-samba.so
+usr/lib/samba/libsamba-policy-private-samba.so
 usr/lib/samba/libsamba-python.cpython-310-aarch64-linux-gnu-private-samba.so
 usr/lib/samba/libsamba-security-private-samba.so
 usr/lib/samba/libsamba-sockets-private-samba.so
 usr/lib/samba/libsamba3-util-private-samba.so
 usr/lib/samba/libsamdb-common-private-samba.so
+usr/lib/samba/libsamdb-private-samba.so
 usr/lib/samba/libsecrets3-private-samba.so
 usr/lib/samba/libserver-id-db-private-samba.so
 usr/lib/samba/libserver-role-private-samba.so
@@ -928,9 +933,9 @@  usr/lib/samba/libtalloc-report-private-samba.so
 usr/lib/samba/libtdb-private-samba.so
 usr/lib/samba/libtdb-wrap-private-samba.so
 usr/lib/samba/libtevent-private-samba.so
+usr/lib/samba/libtevent-util-private-samba.so
 usr/lib/samba/libtime-basic-private-samba.so
 usr/lib/samba/libtorture-private-samba.so
-usr/lib/samba/libtrusts-util-private-samba.so
 usr/lib/samba/libutil-reg-private-samba.so
 usr/lib/samba/libutil-setid-private-samba.so
 usr/lib/samba/libutil-tdb-private-samba.so
diff --git a/config/rootfiles/packages/riscv64/samba b/config/rootfiles/packages/riscv64/samba
index 93e39e0e7..b530ea2b2 100644
--- a/config/rootfiles/packages/riscv64/samba
+++ b/config/rootfiles/packages/riscv64/samba
@@ -57,8 +57,6 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/core/ntstatus_gen.h
 #usr/include/samba-4.0/core/werror.h
 #usr/include/samba-4.0/core/werror_gen.h
-#usr/include/samba-4.0/credentials.h
-#usr/include/samba-4.0/dcerpc.h
 #usr/include/samba-4.0/dcesrv_core.h
 #usr/include/samba-4.0/domain_credentials.h
 #usr/include/samba-4.0/gen_ndr
@@ -80,7 +78,6 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/gen_ndr/ndr_misc.h
 #usr/include/samba-4.0/gen_ndr/ndr_nbt.h
 #usr/include/samba-4.0/gen_ndr/ndr_samr.h
-#usr/include/samba-4.0/gen_ndr/ndr_samr_c.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl_c.h
 #usr/include/samba-4.0/gen_ndr/netlogon.h
@@ -101,9 +98,7 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/ndr/ndr_nbt.h
 #usr/include/samba-4.0/ndr/ndr_svcctl.h
 #usr/include/samba-4.0/netapi.h
-#usr/include/samba-4.0/param.h
 #usr/include/samba-4.0/passdb.h
-#usr/include/samba-4.0/policy.h
 #usr/include/samba-4.0/rpc_common.h
 #usr/include/samba-4.0/samba
 #usr/include/samba-4.0/samba/session.h
@@ -129,9 +124,6 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/util/idtree_random.h
 #usr/include/samba-4.0/util/signal.h
 #usr/include/samba-4.0/util/substitute.h
-#usr/include/samba-4.0/util/tevent_ntstatus.h
-#usr/include/samba-4.0/util/tevent_unix.h
-#usr/include/samba-4.0/util/tevent_werror.h
 #usr/include/samba-4.0/util/tfork.h
 #usr/include/samba-4.0/util/time.h
 #usr/include/samba-4.0/util_ldb.h
@@ -139,15 +131,9 @@  usr/bin/wspsearch
 usr/lib/libdcerpc-binding.so
 usr/lib/libdcerpc-binding.so.0
 usr/lib/libdcerpc-binding.so.0.0.1
-usr/lib/libdcerpc-samr.so
-usr/lib/libdcerpc-samr.so.0
-usr/lib/libdcerpc-samr.so.0.0.1
 usr/lib/libdcerpc-server-core.so
 usr/lib/libdcerpc-server-core.so.0
 usr/lib/libdcerpc-server-core.so.0.0.1
-usr/lib/libdcerpc.so
-usr/lib/libdcerpc.so.0
-usr/lib/libdcerpc.so.0.0.1
 usr/lib/libndr-krb5pac.so
 usr/lib/libndr-krb5pac.so.0
 usr/lib/libndr-krb5pac.so.0.0.1
@@ -158,34 +144,22 @@  usr/lib/libndr-standard.so
 usr/lib/libndr-standard.so.0
 usr/lib/libndr-standard.so.0.0.1
 usr/lib/libndr.so
-usr/lib/libndr.so.4
-usr/lib/libndr.so.4.0.0
+usr/lib/libndr.so.5
+usr/lib/libndr.so.5.0.0
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.1
 usr/lib/libnetapi.so.1.0.0
 usr/lib/libnss_winbind.so.2
 usr/lib/libnss_wins.so.2
-usr/lib/libsamba-credentials.so
-usr/lib/libsamba-credentials.so.1
-usr/lib/libsamba-credentials.so.1.0.0
 usr/lib/libsamba-errors.so
 usr/lib/libsamba-errors.so.1
 usr/lib/libsamba-errors.so.1.0.0
-usr/lib/libsamba-hostconfig.so
-usr/lib/libsamba-hostconfig.so.0
-usr/lib/libsamba-hostconfig.so.0.0.1
 usr/lib/libsamba-passdb.so
 usr/lib/libsamba-passdb.so.0
-usr/lib/libsamba-passdb.so.0.28.0
-usr/lib/libsamba-policy.cpython-310-riscv64-linux-gnu.so
-usr/lib/libsamba-policy.cpython-310-riscv64-linux-gnu.so.0
-usr/lib/libsamba-policy.cpython-310-riscv64-linux-gnu.so.0.0.1
+usr/lib/libsamba-passdb.so.0.29.0
 usr/lib/libsamba-util.so
 usr/lib/libsamba-util.so.0
 usr/lib/libsamba-util.so.0.0.1
-usr/lib/libsamdb.so
-usr/lib/libsamdb.so.0
-usr/lib/libsamdb.so.0.0.1
 usr/lib/libsmbclient.so
 usr/lib/libsmbclient.so.0
 usr/lib/libsmbclient.so.0.8.0
@@ -195,24 +169,15 @@  usr/lib/libsmbconf.so.0.0.1
 usr/lib/libsmbldap.so
 usr/lib/libsmbldap.so.2
 usr/lib/libsmbldap.so.2.1.0
-usr/lib/libtevent-util.so
-usr/lib/libtevent-util.so.0
-usr/lib/libtevent-util.so.0.0.1
 usr/lib/libwbclient.so
 usr/lib/libwbclient.so.0
 usr/lib/libwbclient.so.0.16
-#usr/lib/pkgconfig/dcerpc.pc
-#usr/lib/pkgconfig/dcerpc_samr.pc
 #usr/lib/pkgconfig/ndr.pc
 #usr/lib/pkgconfig/ndr_krb5pac.pc
 #usr/lib/pkgconfig/ndr_nbt.pc
 #usr/lib/pkgconfig/ndr_standard.pc
 #usr/lib/pkgconfig/netapi.pc
-#usr/lib/pkgconfig/samba-credentials.pc
-#usr/lib/pkgconfig/samba-hostconfig.pc
-#usr/lib/pkgconfig/samba-policy.cpython-310-riscv64-linux-gnu.pc
 #usr/lib/pkgconfig/samba-util.pc
-#usr/lib/pkgconfig/samdb.pc
 #usr/lib/pkgconfig/smbclient.pc
 #usr/lib/pkgconfig/wbclient.pc
 usr/lib/python3.10/site-packages/_ldb_text.py
@@ -283,6 +248,31 @@  usr/lib/python3.10/site-packages/samba/dcerpc/xattr.cpython-310-riscv64-linux-gn
 usr/lib/python3.10/site-packages/samba/descriptor.py
 usr/lib/python3.10/site-packages/samba/dnsresolver.py
 usr/lib/python3.10/site-packages/samba/dnsserver.py
+#usr/lib/python3.10/site-packages/samba/domain
+usr/lib/python3.10/site-packages/samba/domain/__init__.py
+#usr/lib/python3.10/site-packages/samba/domain/models
+usr/lib/python3.10/site-packages/samba/domain/models/__init__.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_policy.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_silo.py
+usr/lib/python3.10/site-packages/samba/domain/models/claim_type.py
+usr/lib/python3.10/site-packages/samba/domain/models/computer.py
+usr/lib/python3.10/site-packages/samba/domain/models/constants.py
+usr/lib/python3.10/site-packages/samba/domain/models/container.py
+usr/lib/python3.10/site-packages/samba/domain/models/exceptions.py
+usr/lib/python3.10/site-packages/samba/domain/models/fields.py
+usr/lib/python3.10/site-packages/samba/domain/models/gmsa.py
+usr/lib/python3.10/site-packages/samba/domain/models/group.py
+usr/lib/python3.10/site-packages/samba/domain/models/model.py
+usr/lib/python3.10/site-packages/samba/domain/models/org.py
+usr/lib/python3.10/site-packages/samba/domain/models/person.py
+usr/lib/python3.10/site-packages/samba/domain/models/query.py
+usr/lib/python3.10/site-packages/samba/domain/models/registry.py
+usr/lib/python3.10/site-packages/samba/domain/models/schema.py
+usr/lib/python3.10/site-packages/samba/domain/models/site.py
+usr/lib/python3.10/site-packages/samba/domain/models/subnet.py
+usr/lib/python3.10/site-packages/samba/domain/models/types.py
+usr/lib/python3.10/site-packages/samba/domain/models/user.py
+usr/lib/python3.10/site-packages/samba/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/domain_update.py
 usr/lib/python3.10/site-packages/samba/drs_utils.py
 usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-riscv64-linux-gnu.so
@@ -344,6 +334,7 @@  usr/lib/python3.10/site-packages/samba/kcc/graph_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/kcc_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/ldif_import_export.py
 usr/lib/python3.10/site-packages/samba/logger.py
+usr/lib/python3.10/site-packages/samba/lsa_utils.py
 usr/lib/python3.10/site-packages/samba/mdb_util.py
 usr/lib/python3.10/site-packages/samba/messaging.cpython-310-riscv64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/ms_display_specifiers.py
@@ -366,9 +357,18 @@  usr/lib/python3.10/site-packages/samba/netcmd/dns.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/__init__.py
 #usr/lib/python3.10/site-packages/samba/netcmd/domain/auth
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo_member.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/computer_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/policy.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_to.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/member.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/silo.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/backup.py
 #usr/lib/python3.10/site-packages/samba/netcmd/domain/claim
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim/__init__.py
@@ -381,24 +381,12 @@  usr/lib/python3.10/site-packages/samba/netcmd/domain/demote.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/functional_prep.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/info.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/join.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/kds
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/root_key.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/keytab.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/leave.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/level.py
-#usr/lib/python3.10/site-packages/samba/netcmd/domain/models
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/claim_type.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/exceptions.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/fields.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/group.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/model.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/query.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/schema.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/site.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/subnet.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/user.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/passwordsettings.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/provision.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/samba3upgrade.py
@@ -422,6 +410,10 @@  usr/lib/python3.10/site-packages/samba/netcmd/processes.py
 usr/lib/python3.10/site-packages/samba/netcmd/pso.py
 usr/lib/python3.10/site-packages/samba/netcmd/rodc.py
 usr/lib/python3.10/site-packages/samba/netcmd/schema.py
+#usr/lib/python3.10/site-packages/samba/netcmd/service_account
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/group_msa_membership.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/service_account.py
 usr/lib/python3.10/site-packages/samba/netcmd/shell.py
 usr/lib/python3.10/site-packages/samba/netcmd/sites.py
 usr/lib/python3.10/site-packages/samba/netcmd/spn.py
@@ -515,6 +507,7 @@  usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/check_output.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/downgradedatabase.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/gmsa.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/mdsearch.py
@@ -548,10 +541,10 @@  usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/array.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/bare.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/binding.py
-#usr/lib/python3.10/site-packages/samba/tests/dcerpc/createtrustrelax.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/dnsserver.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/integer.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa.py
+#usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa_utils.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/mdssvc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/misc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/raw_protocol.py
@@ -583,6 +576,8 @@  usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_api.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_dns.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_lock.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_env_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_provision_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_schema_attributes.py
 #usr/lib/python3.10/site-packages/samba/tests/emulate
 #usr/lib/python3.10/site-packages/samba/tests/emulate/__init__.py
@@ -620,6 +615,7 @@  usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/etype_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/fast_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/gkdi_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/krb5/gmsa_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/group_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kcrypto.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py
@@ -716,6 +712,7 @@  usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_policy.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_silo.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_claim.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_kds_root_key.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_models.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/dsacl.py
@@ -738,6 +735,7 @@  usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/provision_userPassword_crypt.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/rodc.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/schema.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/service_account.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/silo_base.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/sites.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/timecmd.py
@@ -782,7 +780,6 @@  usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/upgradeprovisionneeddc.py
 #usr/lib/python3.10/site-packages/samba/tests/usage.py
 #usr/lib/python3.10/site-packages/samba/tests/xattr.py
-#usr/lib/python3.10/site-packages/samba/trust_utils.py
 usr/lib/python3.10/site-packages/samba/upgrade.py
 usr/lib/python3.10/site-packages/samba/upgradehelpers.py
 usr/lib/python3.10/site-packages/samba/uptodateness.py
@@ -808,6 +805,7 @@  usr/lib/samba/krb5/winbind_krb5_locator.so
 #usr/lib/samba/ldb
 usr/lib/samba/ldb/asq.so
 usr/lib/samba/ldb/ildap.so
+usr/lib/samba/ldb/ldap.so
 usr/lib/samba/ldb/ldb.so
 usr/lib/samba/ldb/ldbsamba_extensions.so
 usr/lib/samba/ldb/paged_searches.so
@@ -847,8 +845,10 @@  usr/lib/samba/libcom-err-private-samba.so
 usr/lib/samba/libcommon-auth-private-samba.so
 usr/lib/samba/libdbwrap-private-samba.so
 usr/lib/samba/libdcerpc-pkt-auth-private-samba.so
+usr/lib/samba/libdcerpc-private-samba.so
 usr/lib/samba/libdcerpc-samba-private-samba.so
 usr/lib/samba/libdcerpc-samba4-private-samba.so
+usr/lib/samba/libdcerpc-samr-private-samba.so
 usr/lib/samba/libdnsserver-common-private-samba.so
 usr/lib/samba/libdsdb-module-private-samba.so
 usr/lib/samba/libevents-private-samba.so
@@ -901,14 +901,19 @@  usr/lib/samba/libregistry-private-samba.so
 usr/lib/samba/libreplace-private-samba.so
 usr/lib/samba/libroken-private-samba.so
 usr/lib/samba/libsamba-cluster-support-private-samba.so
+usr/lib/samba/libsamba-credentials-private-samba.so
 usr/lib/samba/libsamba-debug-private-samba.so
+usr/lib/samba/libsamba-hostconfig-private-samba.so
 usr/lib/samba/libsamba-modules-private-samba.so
-usr/lib/samba/libsamba-net.cpython-310-riscv64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-join.cpython-310-riscv64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-private-samba.so
+usr/lib/samba/libsamba-policy-private-samba.so
 usr/lib/samba/libsamba-python.cpython-310-riscv64-linux-gnu-private-samba.so
 usr/lib/samba/libsamba-security-private-samba.so
 usr/lib/samba/libsamba-sockets-private-samba.so
 usr/lib/samba/libsamba3-util-private-samba.so
 usr/lib/samba/libsamdb-common-private-samba.so
+usr/lib/samba/libsamdb-private-samba.so
 usr/lib/samba/libsecrets3-private-samba.so
 usr/lib/samba/libserver-id-db-private-samba.so
 usr/lib/samba/libserver-role-private-samba.so
@@ -928,9 +933,9 @@  usr/lib/samba/libtalloc-report-private-samba.so
 usr/lib/samba/libtdb-private-samba.so
 usr/lib/samba/libtdb-wrap-private-samba.so
 usr/lib/samba/libtevent-private-samba.so
+usr/lib/samba/libtevent-util-private-samba.so
 usr/lib/samba/libtime-basic-private-samba.so
 usr/lib/samba/libtorture-private-samba.so
-usr/lib/samba/libtrusts-util-private-samba.so
 usr/lib/samba/libutil-reg-private-samba.so
 usr/lib/samba/libutil-setid-private-samba.so
 usr/lib/samba/libutil-tdb-private-samba.so
@@ -1019,4 +1024,4 @@  var/log/samba
 var/spool/samba
 srv/web/ipfire/cgi-bin/samba.cgi
 var/ipfire/menu.d/EX-samba.menu
-usr/local/bin/sambactrl
+usr/local/bin/sambactrl
\ No newline at end of file
diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba
index 92862313d..e720457a3 100644
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -57,8 +57,6 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/core/ntstatus_gen.h
 #usr/include/samba-4.0/core/werror.h
 #usr/include/samba-4.0/core/werror_gen.h
-#usr/include/samba-4.0/credentials.h
-#usr/include/samba-4.0/dcerpc.h
 #usr/include/samba-4.0/dcesrv_core.h
 #usr/include/samba-4.0/domain_credentials.h
 #usr/include/samba-4.0/gen_ndr
@@ -80,7 +78,6 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/gen_ndr/ndr_misc.h
 #usr/include/samba-4.0/gen_ndr/ndr_nbt.h
 #usr/include/samba-4.0/gen_ndr/ndr_samr.h
-#usr/include/samba-4.0/gen_ndr/ndr_samr_c.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl.h
 #usr/include/samba-4.0/gen_ndr/ndr_svcctl_c.h
 #usr/include/samba-4.0/gen_ndr/netlogon.h
@@ -101,9 +98,7 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/ndr/ndr_nbt.h
 #usr/include/samba-4.0/ndr/ndr_svcctl.h
 #usr/include/samba-4.0/netapi.h
-#usr/include/samba-4.0/param.h
 #usr/include/samba-4.0/passdb.h
-#usr/include/samba-4.0/policy.h
 #usr/include/samba-4.0/rpc_common.h
 #usr/include/samba-4.0/samba
 #usr/include/samba-4.0/samba/session.h
@@ -129,9 +124,6 @@  usr/bin/wspsearch
 #usr/include/samba-4.0/util/idtree_random.h
 #usr/include/samba-4.0/util/signal.h
 #usr/include/samba-4.0/util/substitute.h
-#usr/include/samba-4.0/util/tevent_ntstatus.h
-#usr/include/samba-4.0/util/tevent_unix.h
-#usr/include/samba-4.0/util/tevent_werror.h
 #usr/include/samba-4.0/util/tfork.h
 #usr/include/samba-4.0/util/time.h
 #usr/include/samba-4.0/util_ldb.h
@@ -139,15 +131,9 @@  usr/bin/wspsearch
 usr/lib/libdcerpc-binding.so
 usr/lib/libdcerpc-binding.so.0
 usr/lib/libdcerpc-binding.so.0.0.1
-usr/lib/libdcerpc-samr.so
-usr/lib/libdcerpc-samr.so.0
-usr/lib/libdcerpc-samr.so.0.0.1
 usr/lib/libdcerpc-server-core.so
 usr/lib/libdcerpc-server-core.so.0
 usr/lib/libdcerpc-server-core.so.0.0.1
-usr/lib/libdcerpc.so
-usr/lib/libdcerpc.so.0
-usr/lib/libdcerpc.so.0.0.1
 usr/lib/libndr-krb5pac.so
 usr/lib/libndr-krb5pac.so.0
 usr/lib/libndr-krb5pac.so.0.0.1
@@ -158,34 +144,22 @@  usr/lib/libndr-standard.so
 usr/lib/libndr-standard.so.0
 usr/lib/libndr-standard.so.0.0.1
 usr/lib/libndr.so
-usr/lib/libndr.so.4
-usr/lib/libndr.so.4.0.0
+usr/lib/libndr.so.5
+usr/lib/libndr.so.5.0.0
 usr/lib/libnetapi.so
 usr/lib/libnetapi.so.1
 usr/lib/libnetapi.so.1.0.0
 usr/lib/libnss_winbind.so.2
 usr/lib/libnss_wins.so.2
-usr/lib/libsamba-credentials.so
-usr/lib/libsamba-credentials.so.1
-usr/lib/libsamba-credentials.so.1.0.0
 usr/lib/libsamba-errors.so
 usr/lib/libsamba-errors.so.1
 usr/lib/libsamba-errors.so.1.0.0
-usr/lib/libsamba-hostconfig.so
-usr/lib/libsamba-hostconfig.so.0
-usr/lib/libsamba-hostconfig.so.0.0.1
 usr/lib/libsamba-passdb.so
 usr/lib/libsamba-passdb.so.0
-usr/lib/libsamba-passdb.so.0.28.0
-usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so
-usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0
-usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0.0.1
+usr/lib/libsamba-passdb.so.0.29.0
 usr/lib/libsamba-util.so
 usr/lib/libsamba-util.so.0
 usr/lib/libsamba-util.so.0.0.1
-usr/lib/libsamdb.so
-usr/lib/libsamdb.so.0
-usr/lib/libsamdb.so.0.0.1
 usr/lib/libsmbclient.so
 usr/lib/libsmbclient.so.0
 usr/lib/libsmbclient.so.0.8.0
@@ -195,24 +169,15 @@  usr/lib/libsmbconf.so.0.0.1
 usr/lib/libsmbldap.so
 usr/lib/libsmbldap.so.2
 usr/lib/libsmbldap.so.2.1.0
-usr/lib/libtevent-util.so
-usr/lib/libtevent-util.so.0
-usr/lib/libtevent-util.so.0.0.1
 usr/lib/libwbclient.so
 usr/lib/libwbclient.so.0
 usr/lib/libwbclient.so.0.16
-#usr/lib/pkgconfig/dcerpc.pc
-#usr/lib/pkgconfig/dcerpc_samr.pc
 #usr/lib/pkgconfig/ndr.pc
 #usr/lib/pkgconfig/ndr_krb5pac.pc
 #usr/lib/pkgconfig/ndr_nbt.pc
 #usr/lib/pkgconfig/ndr_standard.pc
 #usr/lib/pkgconfig/netapi.pc
-#usr/lib/pkgconfig/samba-credentials.pc
-#usr/lib/pkgconfig/samba-hostconfig.pc
-#usr/lib/pkgconfig/samba-policy.cpython-310-x86_64-linux-gnu.pc
 #usr/lib/pkgconfig/samba-util.pc
-#usr/lib/pkgconfig/samdb.pc
 #usr/lib/pkgconfig/smbclient.pc
 #usr/lib/pkgconfig/wbclient.pc
 usr/lib/python3.10/site-packages/_ldb_text.py
@@ -283,6 +248,31 @@  usr/lib/python3.10/site-packages/samba/dcerpc/xattr.cpython-310-x86_64-linux-gnu
 usr/lib/python3.10/site-packages/samba/descriptor.py
 usr/lib/python3.10/site-packages/samba/dnsresolver.py
 usr/lib/python3.10/site-packages/samba/dnsserver.py
+#usr/lib/python3.10/site-packages/samba/domain
+usr/lib/python3.10/site-packages/samba/domain/__init__.py
+#usr/lib/python3.10/site-packages/samba/domain/models
+usr/lib/python3.10/site-packages/samba/domain/models/__init__.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_policy.py
+usr/lib/python3.10/site-packages/samba/domain/models/auth_silo.py
+usr/lib/python3.10/site-packages/samba/domain/models/claim_type.py
+usr/lib/python3.10/site-packages/samba/domain/models/computer.py
+usr/lib/python3.10/site-packages/samba/domain/models/constants.py
+usr/lib/python3.10/site-packages/samba/domain/models/container.py
+usr/lib/python3.10/site-packages/samba/domain/models/exceptions.py
+usr/lib/python3.10/site-packages/samba/domain/models/fields.py
+usr/lib/python3.10/site-packages/samba/domain/models/gmsa.py
+usr/lib/python3.10/site-packages/samba/domain/models/group.py
+usr/lib/python3.10/site-packages/samba/domain/models/model.py
+usr/lib/python3.10/site-packages/samba/domain/models/org.py
+usr/lib/python3.10/site-packages/samba/domain/models/person.py
+usr/lib/python3.10/site-packages/samba/domain/models/query.py
+usr/lib/python3.10/site-packages/samba/domain/models/registry.py
+usr/lib/python3.10/site-packages/samba/domain/models/schema.py
+usr/lib/python3.10/site-packages/samba/domain/models/site.py
+usr/lib/python3.10/site-packages/samba/domain/models/subnet.py
+usr/lib/python3.10/site-packages/samba/domain/models/types.py
+usr/lib/python3.10/site-packages/samba/domain/models/user.py
+usr/lib/python3.10/site-packages/samba/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/domain_update.py
 usr/lib/python3.10/site-packages/samba/drs_utils.py
 usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-x86_64-linux-gnu.so
@@ -344,6 +334,7 @@  usr/lib/python3.10/site-packages/samba/kcc/graph_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/kcc_utils.py
 usr/lib/python3.10/site-packages/samba/kcc/ldif_import_export.py
 usr/lib/python3.10/site-packages/samba/logger.py
+usr/lib/python3.10/site-packages/samba/lsa_utils.py
 usr/lib/python3.10/site-packages/samba/mdb_util.py
 usr/lib/python3.10/site-packages/samba/messaging.cpython-310-x86_64-linux-gnu.so
 usr/lib/python3.10/site-packages/samba/ms_display_specifiers.py
@@ -366,9 +357,18 @@  usr/lib/python3.10/site-packages/samba/netcmd/domain
 usr/lib/python3.10/site-packages/samba/netcmd/domain/__init__.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth
 usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo_member.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/computer_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/policy.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_to.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_from.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_to.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/member.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/auth/silo/silo.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/backup.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim
 usr/lib/python3.10/site-packages/samba/netcmd/domain/claim/__init__.py
@@ -381,24 +381,12 @@  usr/lib/python3.10/site-packages/samba/netcmd/domain/demote.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/functional_prep.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/info.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/join.py
+#usr/lib/python3.10/site-packages/samba/netcmd/domain/kds
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/domain/kds/root_key.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/keytab.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/leave.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/level.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/__init__.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_policy.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/auth_silo.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/claim_type.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/exceptions.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/fields.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/group.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/model.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/query.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/schema.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/site.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/subnet.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/user.py
-usr/lib/python3.10/site-packages/samba/netcmd/domain/models/value_type.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/passwordsettings.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/provision.py
 usr/lib/python3.10/site-packages/samba/netcmd/domain/samba3upgrade.py
@@ -422,6 +410,10 @@  usr/lib/python3.10/site-packages/samba/netcmd/processes.py
 usr/lib/python3.10/site-packages/samba/netcmd/pso.py
 usr/lib/python3.10/site-packages/samba/netcmd/rodc.py
 usr/lib/python3.10/site-packages/samba/netcmd/schema.py
+#usr/lib/python3.10/site-packages/samba/netcmd/service_account
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/__init__.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/group_msa_membership.py
+usr/lib/python3.10/site-packages/samba/netcmd/service_account/service_account.py
 usr/lib/python3.10/site-packages/samba/netcmd/shell.py
 usr/lib/python3.10/site-packages/samba/netcmd/sites.py
 usr/lib/python3.10/site-packages/samba/netcmd/spn.py
@@ -513,16 +505,17 @@  usr/lib/python3.10/site-packages/samba/tdb_util.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/__init__.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/bug13653.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/check_output.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/claims.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/downgradedatabase.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/gmsa.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/http_chunk.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/http_content.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/mdsearch.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/misc_dfs_widelink.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/ndrdump.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/netads_dns.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/netads_json.py
-usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
+#usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/samba_dnsupdate.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/smbcacls.py
 #usr/lib/python3.10/site-packages/samba/tests/blackbox/smbcacls_basic.py
@@ -548,10 +541,10 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/array.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/bare.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/binding.py
-#usr/lib/python3.10/site-packages/samba/tests/dcerpc/createtrustrelax.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/dnsserver.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/integer.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa.py
+#usr/lib/python3.10/site-packages/samba/tests/dcerpc/lsa_utils.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/mdssvc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/misc.py
 #usr/lib/python3.10/site-packages/samba/tests/dcerpc/raw_protocol.py
@@ -583,6 +576,8 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_api.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_dns.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_lock.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_env_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/dsdb_quiet_provision_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/dsdb_schema_attributes.py
 #usr/lib/python3.10/site-packages/samba/tests/emulate
 #usr/lib/python3.10/site-packages/samba/tests/emulate/__init__.py
@@ -620,6 +615,7 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/etype_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/fast_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/gkdi_tests.py
+#usr/lib/python3.10/site-packages/samba/tests/krb5/gmsa_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/group_tests.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kcrypto.py
 #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py
@@ -716,6 +712,7 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_policy.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_auth_silo.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_claim.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_kds_root_key.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/domain_models.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/dsacl.py
@@ -738,6 +735,7 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/provision_userPassword_crypt.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/rodc.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/schema.py
+#usr/lib/python3.10/site-packages/samba/tests/samba_tool/service_account.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/silo_base.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/sites.py
 #usr/lib/python3.10/site-packages/samba/tests/samba_tool/timecmd.py
@@ -782,7 +780,6 @@  usr/lib/python3.10/site-packages/samba/tests/blackbox/rpcd_witness_samba_only.py
 #usr/lib/python3.10/site-packages/samba/tests/upgradeprovisionneeddc.py
 #usr/lib/python3.10/site-packages/samba/tests/usage.py
 #usr/lib/python3.10/site-packages/samba/tests/xattr.py
-usr/lib/python3.10/site-packages/samba/trust_utils.py
 usr/lib/python3.10/site-packages/samba/upgrade.py
 usr/lib/python3.10/site-packages/samba/upgradehelpers.py
 usr/lib/python3.10/site-packages/samba/uptodateness.py
@@ -808,6 +805,7 @@  usr/lib/samba/krb5/winbind_krb5_locator.so
 #usr/lib/samba/ldb
 usr/lib/samba/ldb/asq.so
 usr/lib/samba/ldb/ildap.so
+usr/lib/samba/ldb/ldap.so
 usr/lib/samba/ldb/ldb.so
 usr/lib/samba/ldb/ldbsamba_extensions.so
 usr/lib/samba/ldb/paged_searches.so
@@ -847,8 +845,10 @@  usr/lib/samba/libcom-err-private-samba.so
 usr/lib/samba/libcommon-auth-private-samba.so
 usr/lib/samba/libdbwrap-private-samba.so
 usr/lib/samba/libdcerpc-pkt-auth-private-samba.so
+usr/lib/samba/libdcerpc-private-samba.so
 usr/lib/samba/libdcerpc-samba-private-samba.so
 usr/lib/samba/libdcerpc-samba4-private-samba.so
+usr/lib/samba/libdcerpc-samr-private-samba.so
 usr/lib/samba/libdnsserver-common-private-samba.so
 usr/lib/samba/libdsdb-module-private-samba.so
 usr/lib/samba/libevents-private-samba.so
@@ -901,14 +901,19 @@  usr/lib/samba/libregistry-private-samba.so
 usr/lib/samba/libreplace-private-samba.so
 usr/lib/samba/libroken-private-samba.so
 usr/lib/samba/libsamba-cluster-support-private-samba.so
+usr/lib/samba/libsamba-credentials-private-samba.so
 usr/lib/samba/libsamba-debug-private-samba.so
+usr/lib/samba/libsamba-hostconfig-private-samba.so
 usr/lib/samba/libsamba-modules-private-samba.so
-usr/lib/samba/libsamba-net.cpython-310-x86-64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-join.cpython-310-x86-64-linux-gnu-private-samba.so
+usr/lib/samba/libsamba-net-private-samba.so
+usr/lib/samba/libsamba-policy-private-samba.so
 usr/lib/samba/libsamba-python.cpython-310-x86-64-linux-gnu-private-samba.so
 usr/lib/samba/libsamba-security-private-samba.so
 usr/lib/samba/libsamba-sockets-private-samba.so
 usr/lib/samba/libsamba3-util-private-samba.so
 usr/lib/samba/libsamdb-common-private-samba.so
+usr/lib/samba/libsamdb-private-samba.so
 usr/lib/samba/libsecrets3-private-samba.so
 usr/lib/samba/libserver-id-db-private-samba.so
 usr/lib/samba/libserver-role-private-samba.so
@@ -928,9 +933,9 @@  usr/lib/samba/libtalloc-report-private-samba.so
 usr/lib/samba/libtdb-private-samba.so
 usr/lib/samba/libtdb-wrap-private-samba.so
 usr/lib/samba/libtevent-private-samba.so
+usr/lib/samba/libtevent-util-private-samba.so
 usr/lib/samba/libtime-basic-private-samba.so
 usr/lib/samba/libtorture-private-samba.so
-usr/lib/samba/libtrusts-util-private-samba.so
 usr/lib/samba/libutil-reg-private-samba.so
 usr/lib/samba/libutil-setid-private-samba.so
 usr/lib/samba/libutil-tdb-private-samba.so
diff --git a/lfs/samba b/lfs/samba
index 8d2c6a3a3..8358264a3 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 4.20.4
+VER        = 4.21.0
 SUMMARY    = A SMB/CIFS File, Print, and Authentication Server
 
 THISAPP    = samba-$(VER)
@@ -35,7 +35,7 @@  TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
 PAK_VER    = 105
 
-DEPS       = avahi cups perl-Parse-Yapp wsdd
+DEPS       = avahi cups perl-Parse-Yapp perl-JSON wsdd
 
 SERVICES   = samba
 
@@ -47,7 +47,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 1e5d99ed249f7a2bc21d0efec1d795262c556276984d48a774aef133bc1a9e182b7f20ce85aef2fc2b7d7e0b8b3a4edf1a6a855f679ed4d2408bd69b059463ee
+$(DL_FILE)_BLAKE2 = 0889f2be3b78affee88250114397de87a77da77d9674815ec5605780a6bb3e2e28dbbae53b66695196408f4aef550acce793e6397045fbea4bb236fdd095ce1a
 
 install : $(TARGET)