diff --git a/.gitignore b/.gitignore
index e9c42cc..1143057 100644
--- a/.gitignore
+++ b/.gitignore
@@ -369,3 +369,7 @@ samba-3.6.0pre1.tar.gz
 /samba-4.20.1.tar.asc
 /samba-4.20.2.tar.xz
 /samba-4.20.2.tar.asc
+/samba-4.21.0rc1.tar.xz
+/samba-4.21.0rc1.tar.asc
+/samba-4.21.0rc2.tar.xz
+/samba-4.21.0rc2.tar.asc
diff --git a/samba.spec b/samba.spec
index 3a8f7db..0b041e2 100644
--- a/samba.spec
+++ b/samba.spec
@@ -146,7 +146,7 @@
 
 %define samba_requires_eq()  %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 
-%global samba_version 4.20.2
+%global samba_version 4.21.0
 
 # The release field is extended:
 # <pkgrel>[.<extraver>][.<snapinfo>]%%{?dist}[.<minorbump>]
@@ -161,7 +161,7 @@
 #                    default is 1).
 %global samba_release %autorelease
 
-%global pre_release %nil
+%global pre_release rc2
 %if "x%{?pre_release}" != "x"
 %global samba_release %autorelease -p -e %pre_release
 %endif
@@ -171,29 +171,24 @@
 # projects comsuming those. This is e.g. sssd, openchange, evolution-mapi, ...
 %global libdcerpc_binding_so_version 0
 %global libdcerpc_server_core_so_version 0
-%global libdcerpc_so_version 0
 %global libndr_krb5pac_so_version 0
 %global libndr_nbt_so_version 0
-%global libndr_so_version 4
+%global libndr_so_version 5
 %global libndr_standard_so_version 0
 %global libnetapi_so_version 1
-%global libsamba_credentials_so_version 1
 %global libsamba_errors_so_version 1
-%global libsamba_hostconfig_so_version 0
 %global libsamba_passdb_so_version 0
 %global libsamba_util_so_version 0
-%global libsamdb_so_version 0
 %global libsmbconf_so_version 0
 %global libsmbldap_so_version 2
-%global libtevent_util_so_version 0
 
 %global libsmbclient_so_version 0
 %global libwbclient_so_version 0
 
 %global talloc_version 2.4.2
-%global tdb_version 1.4.10
+%global tdb_version 1.4.11
 %global tevent_version 0.16.1
-%global ldb_version 2.9.1
+%global ldb_version 2.10.0
 
 %global required_mit_krb5 1.20.1
 
@@ -248,6 +243,8 @@ Source18:       samba-winbind-systemd-sysusers.conf
 Source201:      README.downgrade
 Source202:      samba.abignore
 
+Patch0:		sync_machine_password_script_install.patch
+
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-common-libs = %{samba_depver}
@@ -896,13 +893,6 @@ Provides: bundled(libreplace)
 The python3-%{name} package contains the Python 3 libraries needed by programs
 that use SMB, RPC and other Samba provided protocols in Python 3 programs.
 
-%package -n python3-%{name}-devel
-Summary: Samba python devel files
-Requires: python3-%{name} = %{samba_depver}
-
-%description -n python3-%{name}-devel
-The python3-%{name}-devel package contains the Python 3 devel files.
-
 %package -n python3-samba-test
 Summary: Samba Python libraries
 Requires: python3-%{name} = %{samba_depver}
@@ -1862,20 +1852,15 @@ fi
 %files client-libs
 %{_libdir}/libdcerpc-binding.so.%{libdcerpc_binding_so_version}*
 %{_libdir}/libdcerpc-server-core.so.%{libdcerpc_server_core_so_version}*
-%{_libdir}/libdcerpc.so.%{libdcerpc_so_version}*
 %{_libdir}/libndr-krb5pac.so.%{libndr_krb5pac_so_version}*
 %{_libdir}/libndr-nbt.so.%{libndr_nbt_so_version}*
 %{_libdir}/libndr-standard.so.%{libndr_standard_so_version}*
 %{_libdir}/libndr.so.%{libndr_so_version}*
-%{_libdir}/libsamba-credentials.so.%{libsamba_credentials_so_version}*
 %{_libdir}/libsamba-errors.so.%{libsamba_errors_so_version}*
-%{_libdir}/libsamba-hostconfig.so.%{libsamba_hostconfig_so_version}*
 %{_libdir}/libsamba-passdb.so.%{libsamba_passdb_so_version}*
 %{_libdir}/libsamba-util.so.%{libsamba_util_so_version}*
-%{_libdir}/libsamdb.so.%{libsamdb_so_version}*
 %{_libdir}/libsmbconf.so.%{libsmbconf_so_version}*
 %{_libdir}/libsmbldap.so.%{libsmbldap_so_version}*
-%{_libdir}/libtevent-util.so.%{libtevent_util_so_version}*
 
 %dir %{_libdir}/samba
 %{_libdir}/samba/libCHARSET3-private-samba.so
@@ -1900,7 +1885,9 @@ fi
 %{_libdir}/samba/libctdb-event-client-private-samba.so
 %{_libdir}/samba/libdbwrap-private-samba.so
 %{_libdir}/samba/libdcerpc-pkt-auth-private-samba.so
+%{_libdir}/samba/libdcerpc-private-samba.so
 %{_libdir}/samba/libdcerpc-samba-private-samba.so
+%{_libdir}/samba/libdcerpc-server-private-samba.so
 %{_libdir}/samba/libevents-private-samba.so
 %{_libdir}/samba/libflag-mapping-private-samba.so
 %{_libdir}/samba/libgenrand-private-samba.so
@@ -1932,12 +1919,17 @@ fi
 %{_libdir}/samba/libreplace-private-samba.so
 %{_libdir}/samba/libregistry-private-samba.so
 %{_libdir}/samba/libsamba-cluster-support-private-samba.so
+%{_libdir}/samba/libsamba-credentials-private-samba.so
 %{_libdir}/samba/libsamba-debug-private-samba.so
+%{_libdir}/samba/libsamba-hostconfig-private-samba.so
 %{_libdir}/samba/libsamba-modules-private-samba.so
+%{_libdir}/samba/libsamba-net-private-samba.so
+%{_libdir}/samba/libsamba-policy-private-samba.so
 %{_libdir}/samba/libsamba-security-private-samba.so
 %{_libdir}/samba/libsamba-sockets-private-samba.so
 %{_libdir}/samba/libsamba3-util-private-samba.so
 %{_libdir}/samba/libsamdb-common-private-samba.so
+%{_libdir}/samba/libsamdb-private-samba.so
 %{_libdir}/samba/libsecrets3-private-samba.so
 %{_libdir}/samba/libserver-id-db-private-samba.so
 %{_libdir}/samba/libserver-role-private-samba.so
@@ -1952,9 +1944,9 @@ fi
 %{_libdir}/samba/libtalloc-report-printf-private-samba.so
 %{_libdir}/samba/libtalloc-report-private-samba.so
 %{_libdir}/samba/libtdb-wrap-private-samba.so
+%{_libdir}/samba/libtevent-util-private-samba.so
 %{_libdir}/samba/libtime-basic-private-samba.so
 %{_libdir}/samba/libtorture-private-samba.so
-%{_libdir}/samba/libtrusts-util-private-samba.so
 %{_libdir}/samba/libutil-reg-private-samba.so
 %{_libdir}/samba/libutil-setid-private-samba.so
 %{_libdir}/samba/libutil-tdb-private-samba.so
@@ -2184,7 +2176,6 @@ fi
 %{_libdir}/samba/service/smb.so
 %endif
 
-%{_libdir}/libdcerpc-server.so.*
 %{_libdir}/samba/libad-claims-private-samba.so
 %{_libdir}/samba/libauthn-policy-util-private-samba.so
 %{_libdir}/samba/libdsdb-module-private-samba.so
@@ -2214,8 +2205,6 @@ fi
 %{_includedir}/samba-4.0/core/ntstatus_gen.h
 %{_includedir}/samba-4.0/core/werror.h
 %{_includedir}/samba-4.0/core/werror_gen.h
-%{_includedir}/samba-4.0/credentials.h
-%{_includedir}/samba-4.0/dcerpc.h
 %{_includedir}/samba-4.0/dcesrv_core.h
 %{_includedir}/samba-4.0/domain_credentials.h
 %{_includedir}/samba-4.0/gen_ndr/atsvc.h
@@ -2236,7 +2225,6 @@ fi
 %{_includedir}/samba-4.0/gen_ndr/ndr_misc.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_nbt.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_samr.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_samr_c.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_svcctl.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_svcctl_c.h
 %{_includedir}/samba-4.0/gen_ndr/netlogon.h
@@ -2255,9 +2243,7 @@ fi
 %{_includedir}/samba-4.0/ndr/ndr_krb5pac.h
 %{_includedir}/samba-4.0/ndr/ndr_svcctl.h
 %{_includedir}/samba-4.0/ndr/ndr_nbt.h
-%{_includedir}/samba-4.0/param.h
 %{_includedir}/samba-4.0/passdb.h
-%{_includedir}/samba-4.0/policy.h
 %{_includedir}/samba-4.0/rpc_common.h
 %{_includedir}/samba-4.0/samba/session.h
 %{_includedir}/samba-4.0/samba/version.h
@@ -2282,46 +2268,26 @@ fi
 %{_includedir}/samba-4.0/util/idtree_random.h
 %{_includedir}/samba-4.0/util/signal.h
 %{_includedir}/samba-4.0/util/substitute.h
-%{_includedir}/samba-4.0/util/tevent_ntstatus.h
-%{_includedir}/samba-4.0/util/tevent_unix.h
-%{_includedir}/samba-4.0/util/tevent_werror.h
 %{_includedir}/samba-4.0/util/time.h
 %{_includedir}/samba-4.0/util/tfork.h
 %{_includedir}/samba-4.0/util_ldb.h
 %{_libdir}/libdcerpc-binding.so
-%{_libdir}/libdcerpc-samr.so
 %{_libdir}/libdcerpc-server-core.so
-%{_libdir}/libdcerpc.so
 %{_libdir}/libndr-krb5pac.so
 %{_libdir}/libndr-nbt.so
 %{_libdir}/libndr-standard.so
 %{_libdir}/libndr.so
-%{_libdir}/libsamba-credentials.so
 %{_libdir}/libsamba-errors.so
-%{_libdir}/libsamba-hostconfig.so
 %{_libdir}/libsamba-util.so
-%{_libdir}/libsamdb.so
 %{_libdir}/libsmbconf.so
-%{_libdir}/libtevent-util.so
-%{_libdir}/pkgconfig/dcerpc.pc
-%{_libdir}/pkgconfig/dcerpc_samr.pc
 %{_libdir}/pkgconfig/ndr.pc
 %{_libdir}/pkgconfig/ndr_krb5pac.pc
 %{_libdir}/pkgconfig/ndr_nbt.pc
 %{_libdir}/pkgconfig/ndr_standard.pc
-%{_libdir}/pkgconfig/samba-credentials.pc
-%{_libdir}/pkgconfig/samba-hostconfig.pc
 %{_libdir}/pkgconfig/samba-util.pc
-%{_libdir}/pkgconfig/samdb.pc
 %{_libdir}/libsamba-passdb.so
 %{_libdir}/libsmbldap.so
 
-%if %{with dc} || %{with testsuite}
-%{_includedir}/samba-4.0/dcerpc_server.h
-%{_libdir}/libdcerpc-server.so
-%{_libdir}/pkgconfig/dcerpc_server.pc
-%endif
-
 %if %{without libsmbclient}
 %{_includedir}/samba-4.0/libsmbclient.h
 #endif without libsmbclient
@@ -2336,8 +2302,10 @@ fi
 %if %{with vfs_cephfs}
 %files vfs-cephfs
 %{_libdir}/samba/vfs/ceph.so
+%{_libdir}/samba/vfs/ceph_new.so
 %{_libdir}/samba/vfs/ceph_snapshots.so
 %{_mandir}/man8/vfs_ceph.8*
+%{_mandir}/man8/vfs_ceph_new.8*
 %{_mandir}/man8/vfs_ceph_snapshots.8*
 %endif
 
@@ -2372,14 +2340,14 @@ fi
 %files ldb-ldap-modules
 %{_libdir}/samba/ldb/ldbsamba_extensions.so
 %{_libdir}/samba/ldb/ildap.so
+%{_libdir}/samba/ldb/ldap.so
 
 ### LIBS
 %files libs
-%{_libdir}/libdcerpc-samr.so.*
-
 %{_libdir}/samba/libLIBWBCLIENT-OLD-private-samba.so
 %{_libdir}/samba/libauth-unix-token-private-samba.so
 %{_libdir}/samba/libdcerpc-samba4-private-samba.so
+%{_libdir}/samba/libdcerpc-samr-private-samba.so
 %{_libdir}/samba/libdnsserver-common-private-samba.so
 %{_libdir}/samba/libshares-private-samba.so
 %{_libdir}/samba/libsmbpasswdparser-private-samba.so
@@ -2491,6 +2459,7 @@ fi
 %{python3_sitearch}/samba/__pycache__/hostconfig.*.pyc
 %{python3_sitearch}/samba/__pycache__/idmap.*.pyc
 %{python3_sitearch}/samba/__pycache__/join.*.pyc
+%{python3_sitearch}/samba/__pycache__/lsa_utils.*.pyc
 %{python3_sitearch}/samba/__pycache__/logger.*.pyc
 %{python3_sitearch}/samba/__pycache__/mdb_util.*.pyc
 %{python3_sitearch}/samba/__pycache__/ms_display_specifiers.*.pyc
@@ -2504,7 +2473,6 @@ fi
 %{python3_sitearch}/samba/__pycache__/sites.*.pyc
 %{python3_sitearch}/samba/__pycache__/subnets.*.pyc
 %{python3_sitearch}/samba/__pycache__/tdb_util.*.pyc
-%{python3_sitearch}/samba/__pycache__/trust_utils.*.pyc
 %{python3_sitearch}/samba/__pycache__/upgrade.*.pyc
 %{python3_sitearch}/samba/__pycache__/upgradehelpers.*.pyc
 %{python3_sitearch}/samba/__pycache__/xattr.*.pyc
@@ -2570,6 +2538,53 @@ fi
 %{python3_sitearch}/samba/dcerpc/xattr.*.so
 %{python3_sitearch}/samba/descriptor.py
 %{python3_sitearch}/samba/dnsresolver.py
+%dir %{python3_sitearch}/samba/domain
+%{python3_sitearch}/samba/domain/__init__.py
+%{python3_sitearch}/samba/domain/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/domain/models/__init__.py
+%{python3_sitearch}/samba/domain/models/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/auth_policy.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/auth_silo.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/claim_type.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/computer.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/constants.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/container.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/exceptions.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/fields.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/gmsa.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/group.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/model.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/org.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/person.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/query.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/registry.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/schema.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/site.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/subnet.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/types.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/user.*.pyc
+%{python3_sitearch}/samba/domain/models/__pycache__/value_type.*.pyc
+%{python3_sitearch}/samba/domain/models/auth_policy.py
+%{python3_sitearch}/samba/domain/models/auth_silo.py
+%{python3_sitearch}/samba/domain/models/claim_type.py
+%{python3_sitearch}/samba/domain/models/computer.py
+%{python3_sitearch}/samba/domain/models/constants.py
+%{python3_sitearch}/samba/domain/models/container.py
+%{python3_sitearch}/samba/domain/models/exceptions.py
+%{python3_sitearch}/samba/domain/models/fields.py
+%{python3_sitearch}/samba/domain/models/gmsa.py
+%{python3_sitearch}/samba/domain/models/group.py
+%{python3_sitearch}/samba/domain/models/model.py
+%{python3_sitearch}/samba/domain/models/org.py
+%{python3_sitearch}/samba/domain/models/person.py
+%{python3_sitearch}/samba/domain/models/query.py
+%{python3_sitearch}/samba/domain/models/registry.py
+%{python3_sitearch}/samba/domain/models/schema.py
+%{python3_sitearch}/samba/domain/models/site.py
+%{python3_sitearch}/samba/domain/models/subnet.py
+%{python3_sitearch}/samba/domain/models/types.py
+%{python3_sitearch}/samba/domain/models/user.py
+%{python3_sitearch}/samba/domain/models/value_type.py
 %{python3_sitearch}/samba/drs_utils.py
 %{python3_sitearch}/samba/dsdb.*.so
 %{python3_sitearch}/samba/dsdb_dns.*.so
@@ -2581,6 +2596,7 @@ fi
 %{python3_sitearch}/samba/hostconfig.py
 %{python3_sitearch}/samba/idmap.py
 %{python3_sitearch}/samba/join.py
+%{python3_sitearch}/samba/lsa_utils.py
 %{python3_sitearch}/samba/messaging.*.so
 %{python3_sitearch}/samba/ndr.py
 %{python3_sitearch}/samba/net.*.so
@@ -2733,12 +2749,30 @@ fi
 %{python3_sitearch}/samba/netcmd/domain/auth/__init__.py
 %dir %{python3_sitearch}/samba/netcmd/domain/auth/__pycache__
 %{python3_sitearch}/samba/netcmd/domain/auth/__pycache__/__init__.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/auth/__pycache__/policy.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/auth/__pycache__/silo.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/auth/__pycache__/silo_member.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/auth/policy.py
-%{python3_sitearch}/samba/netcmd/domain/auth/silo.py
-%{python3_sitearch}/samba/netcmd/domain/auth/silo_member.py
+%dir %{python3_sitearch}/samba/netcmd/domain/auth/policy
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/computer_allowed_to_authenticate_to.py
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/__init__.py
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/policy.py
+%dir %{python3_sitearch}/samba/netcmd/domain/auth/policy/__pycache__
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/__pycache__/computer_allowed_to_authenticate_to.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/__pycache__/policy.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/__pycache__/service_allowed_to_authenticate_from.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/__pycache__/service_allowed_to_authenticate_to.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/__pycache__/user_allowed_to_authenticate_from.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/__pycache__/user_allowed_to_authenticate_to.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_from.py
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/service_allowed_to_authenticate_to.py
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_from.py
+%{python3_sitearch}/samba/netcmd/domain/auth/policy/user_allowed_to_authenticate_to.py
+%dir %{python3_sitearch}/samba/netcmd/domain/auth/silo
+%{python3_sitearch}/samba/netcmd/domain/auth/silo/__init__.py
+%{python3_sitearch}/samba/netcmd/domain/auth/silo/member.py
+%dir %{python3_sitearch}/samba/netcmd/domain/auth/silo/__pycache__
+%{python3_sitearch}/samba/netcmd/domain/auth/silo/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/silo/__pycache__/member.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/silo/__pycache__/silo.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/auth/silo/silo.py
 %{python3_sitearch}/samba/netcmd/domain/backup.py
 %dir %{python3_sitearch}/samba/netcmd/domain/claim
 %{python3_sitearch}/samba/netcmd/domain/claim/__init__.py
@@ -2755,39 +2789,15 @@ fi
 %{python3_sitearch}/samba/netcmd/domain/functional_prep.py
 %{python3_sitearch}/samba/netcmd/domain/info.py
 %{python3_sitearch}/samba/netcmd/domain/join.py
+%dir %{python3_sitearch}/samba/netcmd/domain/kds
+%{python3_sitearch}/samba/netcmd/domain/kds/__init__.py
+%dir %{python3_sitearch}/samba/netcmd/domain/kds/__pycache__
+%{python3_sitearch}/samba/netcmd/domain/kds/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/kds/__pycache__/root_key.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/kds/root_key.py
 %{python3_sitearch}/samba/netcmd/domain/keytab.py
 %{python3_sitearch}/samba/netcmd/domain/leave.py
 %{python3_sitearch}/samba/netcmd/domain/level.py
-%dir %{python3_sitearch}/samba/netcmd/domain/models
-%{python3_sitearch}/samba/netcmd/domain/models/__init__.py
-%dir %{python3_sitearch}/samba/netcmd/domain/models/__pycache__
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/__init__.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/auth_policy.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/auth_silo.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/claim_type.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/exceptions.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/fields.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/group.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/model.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/query.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/schema.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/site.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/subnet.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/user.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/value_type.*.pyc
-%{python3_sitearch}/samba/netcmd/domain/models/auth_policy.py
-%{python3_sitearch}/samba/netcmd/domain/models/auth_silo.py
-%{python3_sitearch}/samba/netcmd/domain/models/claim_type.py
-%{python3_sitearch}/samba/netcmd/domain/models/exceptions.py
-%{python3_sitearch}/samba/netcmd/domain/models/fields.py
-%{python3_sitearch}/samba/netcmd/domain/models/group.py
-%{python3_sitearch}/samba/netcmd/domain/models/model.py
-%{python3_sitearch}/samba/netcmd/domain/models/query.py
-%{python3_sitearch}/samba/netcmd/domain/models/schema.py
-%{python3_sitearch}/samba/netcmd/domain/models/site.py
-%{python3_sitearch}/samba/netcmd/domain/models/subnet.py
-%{python3_sitearch}/samba/netcmd/domain/models/user.py
-%{python3_sitearch}/samba/netcmd/domain/models/value_type.py
 %{python3_sitearch}/samba/netcmd/domain/passwordsettings.py
 %{python3_sitearch}/samba/netcmd/domain/provision.py
 %{python3_sitearch}/samba/netcmd/domain/samba3upgrade.py
@@ -2812,6 +2822,13 @@ fi
 %{python3_sitearch}/samba/netcmd/pso.py
 %{python3_sitearch}/samba/netcmd/rodc.py
 %{python3_sitearch}/samba/netcmd/schema.py
+%dir %{python3_sitearch}/samba/netcmd/service_account
+%{python3_sitearch}/samba/netcmd/service_account/__init__.py
+%{python3_sitearch}/samba/netcmd/service_account/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/netcmd/service_account/__pycache__/group_msa_membership.*.pyc
+%{python3_sitearch}/samba/netcmd/service_account/__pycache__/service_account.*.pyc
+%{python3_sitearch}/samba/netcmd/service_account/group_msa_membership.py
+%{python3_sitearch}/samba/netcmd/service_account/service_account.py
 %{python3_sitearch}/samba/netcmd/shell.py
 %{python3_sitearch}/samba/netcmd/sites.py
 %{python3_sitearch}/samba/netcmd/spn.py
@@ -2908,20 +2925,19 @@ fi
 %{python3_sitearch}/samba/subunit/__pycache__/run.*.pyc
 %{python3_sitearch}/samba/subunit/run.py
 %{python3_sitearch}/samba/tdb_util.py
-%{python3_sitearch}/samba/trust_utils.py
 %{python3_sitearch}/samba/upgrade.py
 %{python3_sitearch}/samba/upgradehelpers.py
 %{python3_sitearch}/samba/werror.*.so
 %{python3_sitearch}/samba/xattr.py
 %{python3_sitearch}/samba/xattr_native.*.so
 %{python3_sitearch}/samba/xattr_tdb.*.so
-%{_libdir}/libsamba-policy.cpython*.so.*
-%{_libdir}/samba/libsamba-net.cpython*.so
+%{_libdir}/samba/libsamba-net-join.cpython*.so
 %{_libdir}/samba/libsamba-python.cpython*.so
 
 %if %{with includelibs}
 %{_libdir}/samba/libpyldb-util.cpython*.so
-%{_libdir}/samba/libpytalloc-util.cpython*.so
+#FIXME why is it missing?
+#%{_libdir}/samba/libpytalloc-util.cpython*.so
 
 %{python3_sitearch}/__pycache__/_ldb_text*.pyc
 %{python3_sitearch}/__pycache__/_tdb_text*.pyc
@@ -2930,16 +2946,13 @@ fi
 %{python3_sitearch}/_tdb_text.py
 %{python3_sitearch}/_tevent.cpython*.so
 %{python3_sitearch}/ldb.cpython*.so
-%{python3_sitearch}/talloc.cpython*.so
+#FIXME why is it missing?
+#%{python3_sitearch}/talloc.cpython*.so
 %{python3_sitearch}/tdb.cpython*.so
 %{python3_sitearch}/tevent.py
 #endif with includelibs
 %endif
 
-%files -n python3-%{name}-devel
-%{_libdir}/libsamba-policy.*.so
-%{_libdir}/pkgconfig/samba-policy.*.pc
-
 %files -n python3-%{name}-dc
 %{python3_sitearch}/samba/samdb.py
 %{python3_sitearch}/samba/schema.py
@@ -3038,6 +3051,8 @@ fi
 %{python3_sitearch}/samba/tests/__pycache__/dsdb_api.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/dsdb_dns.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/dsdb_lock.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/dsdb_quiet_env_tests.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/dsdb_quiet_provision_tests.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/dsdb_schema_attributes.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/docs.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/domain_backup.*.pyc
@@ -3156,6 +3171,7 @@ fi
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/check_output.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/claims.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/downgradedatabase.*.pyc
+%{python3_sitearch}/samba/tests/blackbox/__pycache__/gmsa.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/http_chunk.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/http_content.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/mdsearch.*.pyc
@@ -3179,6 +3195,7 @@ fi
 %{python3_sitearch}/samba/tests/blackbox/check_output.py
 %{python3_sitearch}/samba/tests/blackbox/claims.py
 %{python3_sitearch}/samba/tests/blackbox/downgradedatabase.py
+%{python3_sitearch}/samba/tests/blackbox/gmsa.py
 %{python3_sitearch}/samba/tests/blackbox/http_chunk.py
 %{python3_sitearch}/samba/tests/blackbox/http_content.py
 %{python3_sitearch}/samba/tests/blackbox/mdsearch.py
@@ -3213,11 +3230,11 @@ fi
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/__init__.*.pyc
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/array.*.pyc
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/bare.*.pyc
-%{python3_sitearch}/samba/tests/dcerpc/__pycache__/createtrustrelax.*.pyc
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/binding.*.pyc
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/dnsserver.*.pyc
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/integer.*.pyc
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/lsa.*.pyc
+%{python3_sitearch}/samba/tests/dcerpc/__pycache__/lsa_utils.*.pyc
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/mdssvc.*.pyc
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/misc.*.pyc
 %{python3_sitearch}/samba/tests/dcerpc/__pycache__/raw_protocol.*.pyc
@@ -3234,10 +3251,10 @@ fi
 %{python3_sitearch}/samba/tests/dcerpc/array.py
 %{python3_sitearch}/samba/tests/dcerpc/bare.py
 %{python3_sitearch}/samba/tests/dcerpc/binding.py
-%{python3_sitearch}/samba/tests/dcerpc/createtrustrelax.py
 %{python3_sitearch}/samba/tests/dcerpc/dnsserver.py
 %{python3_sitearch}/samba/tests/dcerpc/integer.py
 %{python3_sitearch}/samba/tests/dcerpc/lsa.py
+%{python3_sitearch}/samba/tests/dcerpc/lsa_utils.py
 %{python3_sitearch}/samba/tests/dcerpc/mdssvc.py
 %{python3_sitearch}/samba/tests/dcerpc/misc.py
 %{python3_sitearch}/samba/tests/dcerpc/raw_protocol.py
@@ -3268,6 +3285,8 @@ fi
 %{python3_sitearch}/samba/tests/dsdb_dns.py
 %{python3_sitearch}/samba/tests/dsdb_lock.py
 %{python3_sitearch}/samba/tests/dsdb_schema_attributes.py
+%{python3_sitearch}/samba/tests/dsdb_quiet_env_tests.py
+%{python3_sitearch}/samba/tests/dsdb_quiet_provision_tests.py
 %{python3_sitearch}/samba/tests/docs.py
 %{python3_sitearch}/samba/tests/domain_backup.py
 %{python3_sitearch}/samba/tests/domain_backup_offline.py
@@ -3318,6 +3337,7 @@ fi
 %{python3_sitearch}/samba/tests/krb5/__pycache__/etype_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/fast_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/gkdi_tests.*.pyc
+%{python3_sitearch}/samba/tests/krb5/__pycache__/gmsa_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/group_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kcrypto.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_base_test.*.pyc
@@ -3359,6 +3379,7 @@ fi
 %{python3_sitearch}/samba/tests/krb5/etype_tests.py
 %{python3_sitearch}/samba/tests/krb5/fast_tests.py
 %{python3_sitearch}/samba/tests/krb5/gkdi_tests.py
+%{python3_sitearch}/samba/tests/krb5/gmsa_tests.py
 %{python3_sitearch}/samba/tests/krb5/group_tests.py
 %{python3_sitearch}/samba/tests/krb5/kcrypto.py
 %{python3_sitearch}/samba/tests/krb5/kdc_base_test.py
@@ -3462,6 +3483,7 @@ fi
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/domain_auth_policy.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/domain_auth_silo.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/domain_claim.*.pyc
+%{python3_sitearch}/samba/tests/samba_tool/__pycache__/domain_kds_root_key.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/domain_models.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/drs_clone_dc_data_lmdb_size.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/dsacl.*.pyc
@@ -3484,6 +3506,7 @@ fi
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/provision_userPassword_crypt.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/rodc.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/schema.*.pyc
+%{python3_sitearch}/samba/tests/samba_tool/__pycache__/service_account.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/silo_base.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/sites.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/timecmd.*.pyc
@@ -3508,6 +3531,7 @@ fi
 %{python3_sitearch}/samba/tests/samba_tool/domain_auth_policy.py
 %{python3_sitearch}/samba/tests/samba_tool/domain_auth_silo.py
 %{python3_sitearch}/samba/tests/samba_tool/domain_claim.py
+%{python3_sitearch}/samba/tests/samba_tool/domain_kds_root_key.py
 %{python3_sitearch}/samba/tests/samba_tool/domain_models.py
 %{python3_sitearch}/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
 %{python3_sitearch}/samba/tests/samba_tool/dsacl.py
@@ -3530,6 +3554,7 @@ fi
 %{python3_sitearch}/samba/tests/samba_tool/provision_userPassword_crypt.py
 %{python3_sitearch}/samba/tests/samba_tool/rodc.py
 %{python3_sitearch}/samba/tests/samba_tool/schema.py
+%{python3_sitearch}/samba/tests/samba_tool/service_account.py
 %{python3_sitearch}/samba/tests/samba_tool/silo_base.py
 %{python3_sitearch}/samba/tests/samba_tool/sites.py
 %{python3_sitearch}/samba/tests/samba_tool/timecmd.py
@@ -3667,7 +3692,6 @@ fi
 %{_sysconfdir}/ctdb/functions
 %{_sysconfdir}/ctdb/nfs-linux-kernel-callout
 %{_sysconfdir}/ctdb/statd-callout
-%config %{_sysconfdir}/sudoers.d/ctdb
 
 # CTDB scripts, no config files
 # script with executable bit means activated
@@ -3707,6 +3731,8 @@ fi
 %{_libexecdir}/ctdb/ctdb_recovery_helper
 %{_libexecdir}/ctdb/ctdb_takeover_helper
 %{_libexecdir}/ctdb/smnotify
+%{_libexecdir}/ctdb/statd_callout
+%{_libexecdir}/ctdb/statd_callout_helper
 %{_libexecdir}/ctdb/tdb_mutex_check
 
 %dir %{_localstatedir}/lib/ctdb/
@@ -3737,7 +3763,6 @@ fi
 %{_datadir}/ctdb/events/legacy/00.ctdb.script
 %{_datadir}/ctdb/events/legacy/01.reclock.script
 %{_datadir}/ctdb/events/legacy/05.system.script
-%{_datadir}/ctdb/events/legacy/06.nfs.script
 %{_datadir}/ctdb/events/legacy/10.interface.script
 %{_datadir}/ctdb/events/legacy/11.natgw.script
 %{_datadir}/ctdb/events/legacy/11.routing.script
@@ -3746,6 +3771,7 @@ fi
 %{_datadir}/ctdb/events/legacy/31.clamd.script
 %{_datadir}/ctdb/events/legacy/40.vsftpd.script
 %{_datadir}/ctdb/events/legacy/41.httpd.script
+%{_datadir}/ctdb/events/legacy/46.update-keytabs.script
 %{_datadir}/ctdb/events/legacy/47.samba-dcerpcd.script
 %{_datadir}/ctdb/events/legacy/48.netbios.script
 %{_datadir}/ctdb/events/legacy/49.winbind.script
@@ -3753,6 +3779,9 @@ fi
 %{_datadir}/ctdb/events/legacy/60.nfs.script
 %{_datadir}/ctdb/events/legacy/70.iscsi.script
 %{_datadir}/ctdb/events/legacy/91.lvs.script
+#FIXME
+%dir %{_datadir}/scripts
+%{_datadir}/scripts/winbind_ctdb_updatekeytab.sh
 
 %if %{with testsuite}
 %files -n ctdb-tests
diff --git a/sources b/sources
index 9abdbb7..153969e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (samba-4.20.2.tar.xz) = cf07b12b6c1ac9bc3fd0df7fd658529ebd08309a0823f49c68dd3c55c0c80f412d6af50a0f78b8f4484635029aeb292a72dd0a6638edbd463e73baff404d5315
-SHA512 (samba-4.20.2.tar.asc) = a0051efdca684bc6c3e40367b0a8b862d0b1b988aa9c15ec6987d5f97440daa1f7609e6be61611aa9bbed56d89e0258b192c43028384899c75c4cd449cc99694
+SHA512 (samba-4.21.0rc2.tar.xz) = c561a1cff99fd23baa738ce304efacfab1f7033880c6b5da6c6d2fc821a751be4f3a11b6e98700192490df17a87b9d9ba24e1ce7ed17bf6710a80d3a24ee3639
+SHA512 (samba-4.21.0rc2.tar.asc) = 415abad180a9771765a3f17978b9aa8008088ef60aee4fa98a278a8d21fa8fc2cdde4d8b8b6b23ff7476d63f642ba2a0d028e63d12f8d27eddd66030dc1068b2
diff --git a/sync_machine_password_script_install.patch b/sync_machine_password_script_install.patch
new file mode 100644
index 0000000..3a9bbfb
--- /dev/null
+++ b/sync_machine_password_script_install.patch
@@ -0,0 +1,29 @@
+From e7ca8b1768f3b22c8a32c5f2456fce56b8027312 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
+Date: Wed, 14 Aug 2024 15:13:37 +0200
+Subject: [PATCH] s3-script: install script under DATADIR/scripts as manpage
+ implies
+
+Guenther
+
+Signed-off-by: Guenther Deschner <gd@samba.org>
+---
+ source3/script/wscript_build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/script/wscript_build b/source3/script/wscript_build
+index 2b0643b0876..0a4a97ecc11 100644
+--- a/source3/script/wscript_build
++++ b/source3/script/wscript_build
+@@ -6,7 +6,7 @@ bld.INSTALL_FILES('${BINDIR}',
+ 	          'smbtar',
+                   chmod=MODE_755, flat=True)
+ bld.INSTALL_FILES('${BINDIR}', 'samba-log-parser', chmod=MODE_755, flat=True)
+-bld.INSTALL_FILES('${DATADIR}', 'winbind_ctdb_updatekeytab.sh', chmod=MODE_755, flat=True)
++bld.INSTALL_FILES('${DATADIR}/scripts', 'winbind_ctdb_updatekeytab.sh', chmod=MODE_755, flat=True)
+ 
+ # Callout scripts for use in selftest environment
+ bld.SAMBA_SCRIPT('smbaddshare', pattern='smbaddshare', installdir='.')
+-- 
+2.46.0
+