diff options
| author | Stefan Metzmacher <metze@samba.org> | 2023-02-23 15:05:01 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2023-03-22 22:10:32 +0000 |
| commit | 245a8aaf41f652e2112dfa4b2c32613968656380 (patch) | |
| tree | 59dff5981f2f58c450719a94fe408ac72cfd4bc4 /testprogs | |
| parent | da74c3fde105789919f45088fba6a2731a98c35c (diff) | |
| download | samba-245a8aaf41f652e2112dfa4b2c32613968656380.tar.gz | |
samba-tool: let 'domain functionalprep' to use functional level 2016 by default
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/functionalprep.sh | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/testprogs/blackbox/functionalprep.sh b/testprogs/blackbox/functionalprep.sh index e3cec4c2638..3ddd31456f0 100755 --- a/testprogs/blackbox/functionalprep.sh +++ b/testprogs/blackbox/functionalprep.sh @@ -47,6 +47,7 @@ fi cleanup_output_directories() { remove_directory $PREFIX_ABS/2012R2_schema + remove_directory $PREFIX_ABS/2019_schema remove_directory $PREFIX_ABS/$RELEASE remove_directory $PREFIX_ABS/$OLD_RELEASE } @@ -63,6 +64,11 @@ undump_old() PROVISION_OPTS="--use-ntvfs --host-ip6=::1 --host-ip=127.0.0.1" +provision_2019() +{ + $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=REALM --realm=REALM.COM --targetdir=$PREFIX_ABS/2019_schema --base-schema=2019 --host-name=FLPREP +} + provision_2012r2() { $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=REALM --realm=REALM.COM --targetdir=$PREFIX_ABS/2012R2_schema --base-schema=2012_R2 --host-name=FLPREP @@ -82,7 +88,12 @@ ldapcmp() ldapcmp_ignore "msDS-ClaimPossibleValues" "$RELEASE" "2012R2_schema" } -functional_prep() +functional_prep_2016() +{ + $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/2019_schema/private/sam.ldb --function-level=2016 +} + +functional_prep_2012R2() { $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/2012R2_schema/private/sam.ldb --function-level=2012_R2 } @@ -113,7 +124,7 @@ testit $RELEASE undump || failed=$(expr $failed + 1) testit "provision_2012R2_schema" provision_2012r2 || failed=$(expr $failed + 1) # Perform functional prep up to 2012 R2 level -testit "functional_prep" functional_prep || failed=$(expr $failed + 1) +testit "functional_prep_2012R2" functional_prep_2012R2 || failed=$(expr $failed + 1) # check that the databases are now the same testit "check_databases_same" ldapcmp || failed=$(expr $failed + 1) @@ -128,4 +139,12 @@ testit "functional_prep_old" functional_prep_old || failed=$(expr $failed + 1) cleanup_output_directories +# Provision a DC based on 2019 schema +testit "provision_2019_schema" provision_2019 || failed=$(expr $failed + 1) + +# Perform functional prep up to 2016 level +testit "functional_prep_2016" functional_prep_2016 || failed=$(expr $failed + 1) + +cleanup_output_directories + exit $failed |