From b36a64289c33d579a2229e1bdfcd6932f0cb208e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pavel=20Filipensk=C3=BD?= Date: Thu, 3 Jul 2025 23:07:37 +0200 Subject: [PATCH] tests: Replace PREFIX_ABS with PREFIX MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Pavel Filipenský Reviewed-by: Andreas Schneider --- python/samba/tests/blackbox/bug13653.py | 2 +- python/samba/tests/smb3unix.py | 2 +- selftest/perf_tests.py | 2 +- selftest/tests.py | 38 ++-- source3/script/tests/test_chdir_cache.sh | 8 +- source3/script/tests/test_dfree_quota.sh | 2 +- source3/script/tests/test_groupmap.sh | 2 +- source3/script/tests/test_smbspool.sh | 6 +- source3/script/tests/test_smbstatus.sh | 8 +- source3/script/tests/test_update_keytab.sh | 10 +- .../tests/test_update_keytab_clustered.sh | 16 +- source3/script/tests/test_veto_files.sh | 4 +- .../tests/test_winbind_call_depth_trace.sh | 5 +- source3/script/updatekeytab_test.sh | 2 +- source4/selftest/tests.py | 40 ++--- testprogs/blackbox/common-links.sh | 50 +++--- testprogs/blackbox/dbcheck-links.sh | 168 +++++++++--------- testprogs/blackbox/dbcheck-oldrelease.sh | 106 +++++------ testprogs/blackbox/demote-saveddb.sh | 10 +- testprogs/blackbox/functionalprep.sh | 40 ++--- testprogs/blackbox/join_ldapcmp.sh | 4 +- testprogs/blackbox/ldapcmp_restoredc.sh | 8 +- testprogs/blackbox/runtime-links.sh | 12 +- testprogs/blackbox/schemaupgrade.sh | 22 +-- testprogs/blackbox/test_client_etypes.sh | 2 +- testprogs/blackbox/test_net_ads_fips.sh | 2 +- testprogs/blackbox/test_net_offline.sh | 2 +- testprogs/blackbox/test_old_enctypes.sh | 10 +- testprogs/blackbox/test_primary_group.sh | 6 +- testprogs/blackbox/test_special_group.sh | 8 +- testprogs/blackbox/tombstones-expunge.sh | 70 ++++---- .../blackbox/upgradeprovision-oldrelease.sh | 74 ++++---- 32 files changed, 370 insertions(+), 371 deletions(-) diff --git a/python/samba/tests/blackbox/bug13653.py b/python/samba/tests/blackbox/bug13653.py index 215b9fcc378..ca5e99211a4 100644 --- a/python/samba/tests/blackbox/bug13653.py +++ b/python/samba/tests/blackbox/bug13653.py @@ -131,7 +131,7 @@ class Bug13653Tests(BlackboxTestCase): super().setUp() self.env = os.environ["TEST_ENV"] self.server = os.environ["SERVER"] - self.prefix = os.environ["PREFIX_ABS"] + self.prefix = os.environ["PREFIX"] lp = env_loadparm() creds = Credentials() session = system_session() diff --git a/python/samba/tests/smb3unix.py b/python/samba/tests/smb3unix.py index 289bc5ac5b4..a34dbe81517 100644 --- a/python/samba/tests/smb3unix.py +++ b/python/samba/tests/smb3unix.py @@ -37,7 +37,7 @@ class Smb3UnixTests(samba.tests.libsmb.LibsmbTests): super().setUp() self.samsid = os.environ["SAMSID"] - prefix_abs = os.environ["PREFIX_ABS"] + prefix_abs = os.environ["PREFIX"] p = subprocess.run(['stat', '-f', '-c', '%T', prefix_abs], capture_output=True, text=True) self.fstype = p.stdout.strip().lower() diff --git a/selftest/perf_tests.py b/selftest/perf_tests.py index cfbbf0e056e..60cfeddb2d7 100644 --- a/selftest/perf_tests.py +++ b/selftest/perf_tests.py @@ -71,7 +71,7 @@ plantestsuite_loadlist("samba4.ldb.multi_connect.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(samba4srcdir, "dsdb/tests/python/ad_dc_multi_bind.py"), - 'tdb://$PREFIX_ABS/ad_dc_ntvfs/private/sam.ldb', + 'tdb://$PREFIX/ad_dc_ntvfs/private/sam.ldb', '$LOADLIST', '$LISTOPT']) plantestsuite_loadlist("samba4.ldap.vlv.python(ad_dc_ntvfs)", "ad_dc_ntvfs", diff --git a/selftest/tests.py b/selftest/tests.py index c5336c7130a..81c7f78e039 100644 --- a/selftest/tests.py +++ b/selftest/tests.py @@ -241,99 +241,99 @@ def cmdline(script, *args): plantestsuite( "samba4.blackbox.demote-saveddb", "none", - cmdline('demote-saveddb.sh', '$PREFIX_ABS/demote')) + cmdline('demote-saveddb.sh', '$PREFIX/demote')) plantestsuite( "samba4.blackbox.dbcheck.alpha13", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'alpha13')) # same test as above but skip member link checks plantestsuite( "samba4.blackbox.dbcheck.alpha13.quick", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'alpha13', '--quick-membership-checks')) plantestsuite( "samba4.blackbox.dbcheck.release-4-0-0", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'release-4-0-0')) # same test as above but skip member link checks plantestsuite( "samba4.blackbox.dbcheck.release-4-0-0.quick", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'release-4-0-0', '--quick-membership-checks')) plantestsuite( "samba4.blackbox.dbcheck.release-4-1-0rc3", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'release-4-1-0rc3')) # same test as above but skip member link checks plantestsuite( "samba4.blackbox.dbcheck.release-4-1-0rc3.quick", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'release-4-1-0rc3', '--quick-membership-checks')) plantestsuite( "samba4.blackbox.dbcheck.release-4-1-6-partial-object", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'release-4-1-6-partial-object')) # same test as above but skip member link checks plantestsuite( "samba4.blackbox.dbcheck.release-4-1-6-partial-object.quick", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'release-4-1-6-partial-object', '--quick-membership-checks')) plantestsuite( "samba4.blackbox.dbcheck.release-4-5-0-pre1", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'release-4-5-0-pre1')) # same test as above but skip member link checks plantestsuite( "samba4.blackbox.dbcheck.release-4-5-0-pre1.quick", "none", - cmdline('dbcheck-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-oldrelease.sh', '$PREFIX/provision', 'release-4-5-0-pre1', '--quick-membership-checks')) plantestsuite( "samba4.blackbox.upgradeprovision.alpha13", "none", - cmdline('upgradeprovision-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('upgradeprovision-oldrelease.sh', '$PREFIX/provision', 'alpha13')) plantestsuite( "samba4.blackbox.upgradeprovision.release-4-0-0", "none", - cmdline('upgradeprovision-oldrelease.sh', '$PREFIX_ABS/provision', + cmdline('upgradeprovision-oldrelease.sh', '$PREFIX/provision', 'release-4-0-0')) plantestsuite( "samba4.blackbox.tombstones-expunge.release-4-5-0-pre1", "none", - cmdline('tombstones-expunge.sh', '$PREFIX_ABS/provision', + cmdline('tombstones-expunge.sh', '$PREFIX/provision', 'release-4-5-0-pre1')) plantestsuite( "samba4.blackbox.dbcheck-links.release-4-5-0-pre1", "none", - cmdline('dbcheck-links.sh', '$PREFIX_ABS/provision', + cmdline('dbcheck-links.sh', '$PREFIX/provision', 'release-4-5-0-pre1')) plantestsuite( "samba4.blackbox.runtime-links.release-4-5-0-pre1", "none", - cmdline('runtime-links.sh', '$PREFIX_ABS/provision', + cmdline('runtime-links.sh', '$PREFIX/provision', 'release-4-5-0-pre1')) plantestsuite( "samba4.blackbox.schemaupgrade", "none", - cmdline('schemaupgrade.sh', '$PREFIX_ABS/provision')) + cmdline('schemaupgrade.sh', '$PREFIX/provision')) plantestsuite( "samba4.blackbox.functionalprep", "none", - cmdline('functionalprep.sh', '$PREFIX_ABS/provision')) + cmdline('functionalprep.sh', '$PREFIX/provision')) plantestsuite( "samba4.blackbox.test_special_group", "none", - cmdline('test_special_group.sh', '$PREFIX_ABS/provision')) + cmdline('test_special_group.sh', '$PREFIX/provision')) planpythontestsuite("fileserver", "samba.tests.blackbox.http_content") planpythontestsuite("fileserver", "samba.tests.blackbox.http_chunk") diff --git a/source3/script/tests/test_chdir_cache.sh b/source3/script/tests/test_chdir_cache.sh index 29f54d16122..a96713782e2 100755 --- a/source3/script/tests/test_chdir_cache.sh +++ b/source3/script/tests/test_chdir_cache.sh @@ -28,8 +28,6 @@ shift 1 TESTENV=${1} shift 1 -PREFIX_ABS="$(readlink -f "${PREFIX}")" - # Do not let deprecated option warnings muck this up SAMBA_DEPRECATED_SUPPRESS=1 export SAMBA_DEPRECATED_SUPPRESS @@ -56,10 +54,10 @@ ${SMBCLIENT} //${SERVER}/${SHARE} ${CONF} -U${USER}%${PASSWORD} \ smbclient-stdout 2>smbclient-stderr & CLIENT_PID=$! -log_file="${PREFIX_ABS}/${TESTENV}/smbd_test.log" +log_file="${PREFIX}/${TESTENV}/smbd_test.log" # Add support for "SMBD_DONT_LOG_STDOUT=1" -if [ -r "${PREFIX_ABS}/${TESTENV}/logs/log.smbd" ]; then - log_file="${PREFIX_ABS}/${TESTENV}/logs/log.smbd" +if [ -r "${PREFIX}/${TESTENV}/logs/log.smbd" ]; then + log_file="${PREFIX}/${TESTENV}/logs/log.smbd" fi # Count the number of chdir_current_service: vfs_ChDir.*failed: Permission denied diff --git a/source3/script/tests/test_dfree_quota.sh b/source3/script/tests/test_dfree_quota.sh index 8248edfd7a7..e9bb987e1bb 100755 --- a/source3/script/tests/test_dfree_quota.sh +++ b/source3/script/tests/test_dfree_quota.sh @@ -191,7 +191,7 @@ test_smbcquotas() mproto="-m SMB1" fi - smbcquotas_stderr="$(mktemp "${PREFIX_ABS}/smbcquotas.XXXXXXXXXX")" + smbcquotas_stderr="$(mktemp "${PREFIX}/smbcquotas.XXXXXXXXXX")" output=$($VALGRIND $smbcquotas $mproto //$SERVER/dfq "$@" 2>"${smbcquotas_stderr}") status=$? diff --git a/source3/script/tests/test_groupmap.sh b/source3/script/tests/test_groupmap.sh index a1e9a0832df..a9cec35d116 100755 --- a/source3/script/tests/test_groupmap.sh +++ b/source3/script/tests/test_groupmap.sh @@ -21,7 +21,7 @@ treport() TBASE=$TNOW } -rm -f $PREFIX_ABS/var/locks/group_mapping.?db +rm -f $PREFIX/var/locks/group_mapping.?db NLOCAL=12 NGROUP=11 diff --git a/source3/script/tests/test_smbspool.sh b/source3/script/tests/test_smbspool.sh index 2036d57566c..7f777174d64 100755 --- a/source3/script/tests/test_smbspool.sh +++ b/source3/script/tests/test_smbspool.sh @@ -105,7 +105,7 @@ test_smbspool_authinforequired_unknown() # test_vlp_verify() { - tdbfile="$PREFIX_ABS/$TARGET_ENV/lockdir/vlp.tdb" + tdbfile="$PREFIX/$TARGET_ENV/lockdir/vlp.tdb" if [ ! -w $tdbfile ]; then echo "vlp tdbfile $tdbfile doesn't exist or is not writeable!" return 1 @@ -128,7 +128,7 @@ test_vlp_verify() fi file=$(echo "$out" | awk '/[0-9]+/ { print $6 };') - if [ ! -r $PREFIX_ABS/$TARGET_ENV/share/$file ]; then + if [ ! -r $PREFIX/$TARGET_ENV/share/$file ]; then echo "$file doesn't exist" echo "$out" return 1 @@ -144,7 +144,7 @@ test_vlp_verify() test_delete_on_close() { - tdbfile="$PREFIX_ABS/$TARGET_ENV/lockdir/vlp.tdb" + tdbfile="$PREFIX/$TARGET_ENV/lockdir/vlp.tdb" if [ ! -w $tdbfile ]; then echo "vlp tdbfile $tdbfile doesn't exist or is not writeable!" return 1 diff --git a/source3/script/tests/test_smbstatus.sh b/source3/script/tests/test_smbstatus.sh index eefd71482d8..f451278b4d6 100755 --- a/source3/script/tests/test_smbstatus.sh +++ b/source3/script/tests/test_smbstatus.sh @@ -43,7 +43,7 @@ test_smbstatus() What a Wurst! EOF cat >$cmdfile <$cmdfile <$cmdfile < $status_shares @@ -249,7 +249,7 @@ test_smbstatus_json() Hello World! EOF cat > $cmdfile < "$TMPDIR/${keytab}_${testname}" + $samba_net ads keytab list "$PREFIX/ad_member_idmap_nss/$keytab" | grep -v "^Vno\|^Warning\|^$" > "$TMPDIR/${keytab}_${testname}" done # Compare keytabs that do not sync kvno @@ -540,7 +540,7 @@ test_pwd_change() # Create tmp dir -TMPDIR=$(mktemp -d "$PREFIX_ABS/ad_member_idmap_nss/keytab_dir_XXXXXX") +TMPDIR=$(mktemp -d "$PREFIX/ad_member_idmap_nss/keytab_dir_XXXXXX") # Create template files using the variables defined above printf '%s' "$keytab0" > "$TMPDIR/keytab0_template" @@ -563,7 +563,7 @@ printf '%s' "$keytab4k" > "$TMPDIR/keytab4k_template" # Remove all keytabs for keytab in $keytabs_all do - rm -f "$PREFIX_ABS/ad_member_idmap_nss/$keytab" + rm -f "$PREFIX/ad_member_idmap_nss/$keytab" done DC_DNSNAME="${DC_SERVER}.${REALM}" diff --git a/source3/script/tests/test_update_keytab_clustered.sh b/source3/script/tests/test_update_keytab_clustered.sh index 0fc299d041c..045c67063ae 100755 --- a/source3/script/tests/test_update_keytab_clustered.sh +++ b/source3/script/tests/test_update_keytab_clustered.sh @@ -66,11 +66,11 @@ test_pwd_change() local cmd="$*"; # get biggest vno before password change - get_biggest_vno "$PREFIX_ABS/clusteredmember/node.0/keytab0" + get_biggest_vno "$PREFIX/clusteredmember/node.0/keytab0" old_vno_node0=$vno - get_biggest_vno "$PREFIX_ABS/clusteredmember/node.1/keytab0" + get_biggest_vno "$PREFIX/clusteredmember/node.1/keytab0" old_vno_node1=$vno - get_biggest_vno "$PREFIX_ABS/clusteredmember/node.2/keytab0" + get_biggest_vno "$PREFIX/clusteredmember/node.2/keytab0" old_vno_node2=$vno if [ ! "$old_vno_node0" -gt 0 ] ; then @@ -106,11 +106,11 @@ test_pwd_change() fi # if keytab was updated the bigest vno should be incremented by one - get_biggest_vno "$PREFIX_ABS/clusteredmember/node.0/keytab0" + get_biggest_vno "$PREFIX/clusteredmember/node.0/keytab0" new_vno_node0=$vno - get_biggest_vno "$PREFIX_ABS/clusteredmember/node.0/keytab0" + get_biggest_vno "$PREFIX/clusteredmember/node.0/keytab0" new_vno_node1=$vno - get_biggest_vno "$PREFIX_ABS/clusteredmember/node.0/keytab0" + get_biggest_vno "$PREFIX/clusteredmember/node.0/keytab0" new_vno_node2=$vno if [ ! "$new_vno_node0" -eq $((old_vno_node0 + 1)) ] ; then @@ -134,9 +134,9 @@ test_keytab_create() DC_DNSNAME="${DC_SERVER}.${REALM}" SMBCLIENT_UNC="//${DC_DNSNAME}/tmp" -install source3/script/updatekeytab_test.sh "$PREFIX_ABS/clusteredmember/updatekeytab.sh" +install source3/script/updatekeytab_test.sh "$PREFIX/clusteredmember/updatekeytab.sh" global_inject_conf=$(dirname $SMB_CONF_PATH)/global_inject.conf -echo "sync machine password script = $PREFIX_ABS/clusteredmember/updatekeytab.sh" >$global_inject_conf +echo "sync machine password script = $PREFIX/clusteredmember/updatekeytab.sh" >$global_inject_conf UID_WRAPPER_ROOT=1 $smbcontrol winbindd reload-config testit "net_ads_testjoin_initial" check_net_ads_testjoin || failed=$((failed + 1)) diff --git a/source3/script/tests/test_veto_files.sh b/source3/script/tests/test_veto_files.sh index 65767aca1d9..93999d1ed8a 100755 --- a/source3/script/tests/test_veto_files.sh +++ b/source3/script/tests/test_veto_files.sh @@ -33,7 +33,7 @@ incdir=$(dirname "$0")/../../../testprogs/blackbox failed=0 -TMPDIR=${PREFIX_ABS}/$(basename "${0}") +TMPDIR=${PREFIX}/$(basename "${0}") mkdir -p "${TMPDIR}" || exit 1 cd "${TMPDIR}" || exit 1 @@ -298,6 +298,6 @@ testit "per-user" test_per_user || failed=$(("$failed" + 1)) do_cleanup -cd "${PREFIX_ABS}" && rm -rf ${TMPDIR} +cd "${PREFIX}" && rm -rf ${TMPDIR} exit "$failed" diff --git a/source3/script/tests/test_winbind_call_depth_trace.sh b/source3/script/tests/test_winbind_call_depth_trace.sh index a89dbcc4ae6..9729afcafd3 100755 --- a/source3/script/tests/test_winbind_call_depth_trace.sh +++ b/source3/script/tests/test_winbind_call_depth_trace.sh @@ -19,14 +19,13 @@ incdir=$(dirname "$0")/../../../testprogs/blackbox failed=0 -PREFIX_ABS="$(readlink -f "${PREFIX}")" # Strip from TESTENV the ':local' if present TESTENV_SUBDIR=${TESTENV%:*} -LOGFILE="${PREFIX_ABS}/${TESTENV_SUBDIR}/logs/log.winbindd" +LOGFILE="${PREFIX}/${TESTENV_SUBDIR}/logs/log.winbindd" # Add support for "WINBINDD_DONT_LOG_STDOUT=1" if [ ! -r "${LOGFILE}" ]; then - TEST_LOGFILE="${PREFIX_ABS}/${TESTENV_SUBDIR}/winbindd_test.log" + TEST_LOGFILE="${PREFIX}/${TESTENV_SUBDIR}/winbindd_test.log" subunit_start_test "test winbind call depth trace" subunit_skip_test "test winbind call depth trace" <$tmpldif1 + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif1 - $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $3 --fix --yes >$tmpfile + $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX/${RELEASE}/private/sam.ldb $3 --fix --yes >$tmpfile if [ "$?" != "$2" ]; then return 1 fi @@ -50,8 +52,8 @@ dbcheck() return 1 fi - tmpldif2=$PREFIX_ABS/$RELEASE/expected-dbcheck-output${1}2.txt.tmp2 - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif2 + tmpldif2=$PREFIX/$RELEASE/expected-dbcheck-output${1}2.txt.tmp2 + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif2 diff -u $tmpldif1 $tmpldif2 if [ "$?" != "0" ]; then @@ -61,12 +63,12 @@ dbcheck() dbcheck_acl_reset() { - $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --cross-ncs --fix --yes --attrs=nTSecurityDescriptor + $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --cross-ncs --fix --yes --attrs=nTSecurityDescriptor } dbcheck_acl_clean() { - $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --cross-ncs --attrs=nTSecurityDescriptor + $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --cross-ncs --attrs=nTSecurityDescriptor } dbcheck_dangling() @@ -83,16 +85,16 @@ dbcheck_one_way() dbcheck_clean() { - tmpldif1=$PREFIX_ABS/$RELEASE/expected-dbcheck-output2.txt.tmp1 + tmpldif1=$PREFIX/$RELEASE/expected-dbcheck-output2.txt.tmp1 - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif1 + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif1 - $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb + $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX/${RELEASE}/private/sam.ldb if [ "$?" != "0" ]; then return 1 fi - tmpldif2=$PREFIX_ABS/$RELEASE/expected-dbcheck-output2.txt.tmp2 - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif2 + tmpldif2=$PREFIX/$RELEASE/expected-dbcheck-output2.txt.tmp2 + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif2 diff -u $tmpldif1 $tmpldif2 if [ "$?" != "0" ]; then @@ -102,8 +104,8 @@ dbcheck_clean() check_expected_after_links() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-links-after-link-dbcheck.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted member >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-links-after-link-dbcheck.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted member >$tmpldif diff -u $tmpldif $release_dir/expected-links-after-link-dbcheck.ldif if [ "$?" != "0" ]; then return 1 @@ -112,8 +114,8 @@ check_expected_after_links() check_expected_after_deleted_links() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-deleted-links-after-link-dbcheck.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-deleted-links-after-link-dbcheck.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member >$tmpldif diff -u $tmpldif $release_dir/expected-deleted-links-after-link-dbcheck.ldif if [ "$?" != "0" ]; then return 1 @@ -122,8 +124,8 @@ check_expected_after_deleted_links() check_expected_after_objects() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-objects-after-link-dbcheck.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(samaccountname=fred)(samaccountname=ddg)(samaccountname=usg)(samaccountname=user1)(samaccountname=user1x)(samaccountname=user2))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted samAccountName | grep sAMAccountName >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-objects-after-link-dbcheck.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(|(samaccountname=fred)(samaccountname=ddg)(samaccountname=usg)(samaccountname=user1)(samaccountname=user1x)(samaccountname=user2))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted samAccountName | grep sAMAccountName >$tmpldif diff -u $tmpldif $release_dir/expected-objects-after-link-dbcheck.ldif if [ "$?" != "0" ]; then return 1 @@ -134,10 +136,10 @@ duplicate_member() { # We use an existing group so we have a stable GUID in the # dbcheck output - LDIF1=$(TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb -b 'CN=Enterprise Admins,CN=users,DC=release-4-5-0-pre1,DC=samba,DC=corp' --scope=base --reveal --extended-dn member) + LDIF1=$(TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb -b 'CN=Enterprise Admins,CN=users,DC=release-4-5-0-pre1,DC=samba,DC=corp' --scope=base --reveal --extended-dn member) DN=$(echo "${LDIF1}" | grep '^dn: ') MSG=$(echo "${LDIF1}" | grep -v '^dn: ' | grep -v '^#' | grep -v '^$') - ldif=$PREFIX_ABS/${RELEASE}/duplicate-member-multi.ldif + ldif=$PREFIX/${RELEASE}/duplicate-member-multi.ldif { echo "${DN}" echo "changetype: modify" @@ -146,7 +148,7 @@ duplicate_member() echo "${MSG}" | sed -e 's!RMD_LOCAL_USN=[1-9][0-9]*!RMD_LOCAL_USN=0!' } >$ldif - TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif + TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif if [ "$?" != "0" ]; then return 1 fi @@ -160,8 +162,8 @@ dbcheck_duplicate_member() check_expected_after_duplicate_links() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-duplicates-after-link-dbcheck.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=administrator)(cn=enterprise admins))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted memberOf member >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-duplicates-after-link-dbcheck.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(|(cn=administrator)(cn=enterprise admins))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted memberOf member >$tmpldif diff -u $tmpldif $release_dir/expected-duplicates-after-link-dbcheck.ldif if [ "$?" != "0" ]; then return 1 @@ -172,7 +174,7 @@ missing_link_sid_corruption() { # Step1: add user "missingsidu1" # - ldif=$PREFIX_ABS/${RELEASE}/missing_link_sid_corruption1.ldif + ldif=$PREFIX/${RELEASE}/missing_link_sid_corruption1.ldif cat >$ldif <$ldif <$ldif <$ldif <$ldif - out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) + out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) if [ "$?" != "0" ]; then echo "ldbmodify returned:\n$out" return 1 @@ -279,7 +281,7 @@ dbcheck_missing_link_sid_corruption() add_lost_deleted_user1() { - ldif=$PREFIX_ABS/${RELEASE}/add_lost_deleted_user1.ldif + ldif=$PREFIX/${RELEASE}/add_lost_deleted_user1.ldif cat >$ldif <" --show-recycled --relax) + out=$(TZ=UTC $ldbdel -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "" --show-recycled --relax) if [ "$?" != "0" ]; then echo "ldbdel returned:\n$out" return 1 @@ -390,7 +392,7 @@ remove_lost_deleted_user1() add_lost_deleted_user2() { - ldif=$PREFIX_ABS/${RELEASE}/add_lost_deleted_user2.ldif + ldif=$PREFIX/${RELEASE}/add_lost_deleted_user2.ldif cat >$ldif <$ldif <" --show-recycled --relax) + out=$(TZ=UTC $ldbdel -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "" --show-recycled --relax) if [ "$?" != "0" ]; then echo "ldbdel returned:\n$out" return 1 @@ -606,10 +608,10 @@ forward_link_corruption() # Step1: add a duplicate forward link from # "CN=Enterprise Admins" to "CN=Administrator" # - LDIF1=$(TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb -b 'CN=Enterprise Admins,CN=users,DC=release-4-5-0-pre1,DC=samba,DC=corp' --scope=base --reveal --extended-dn member) + LDIF1=$(TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb -b 'CN=Enterprise Admins,CN=users,DC=release-4-5-0-pre1,DC=samba,DC=corp' --scope=base --reveal --extended-dn member) DN=$(echo "${LDIF1}" | grep '^dn: ') MSG=$(echo "${LDIF1}" | grep -v '^dn: ' | grep -v '^#' | grep -v '^$') - ldif=$PREFIX_ABS/${RELEASE}/forward_link_corruption1.ldif + ldif=$PREFIX/${RELEASE}/forward_link_corruption1.ldif { echo "${DN}" echo "changetype: modify" @@ -618,7 +620,7 @@ forward_link_corruption() echo "${MSG}" | sed -e 's!RMD_LOCAL_USN=[1-9][0-9]*!RMD_LOCAL_USN=0!' } >$ldif - out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) + out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) if [ "$?" != "0" ]; then echo "ldbmodify returned:\n$out" return 1 @@ -627,7 +629,7 @@ forward_link_corruption() # # Step2: add user "dangling" # - ldif=$PREFIX_ABS/${RELEASE}/forward_link_corruption2.ldif + ldif=$PREFIX/${RELEASE}/forward_link_corruption2.ldif cat >$ldif <;;CN=Enterprise Admins,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp" } >$ldif - out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) + out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) if [ "$?" != "0" ]; then echo "ldbmodify returned:\n$out" return 1 @@ -669,8 +671,8 @@ dbcheck_forward_link_corruption() check_expected_after_dbcheck_forward_link_corruption() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-after-dbcheck-forward-link-corruption.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=dangling)(cn=enterprise admins))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted memberOf member >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-after-dbcheck-forward-link-corruption.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(|(cn=dangling)(cn=enterprise admins))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted memberOf member >$tmpldif diff -u $tmpldif $release_dir/expected-after-dbcheck-forward-link-corruption.ldif if [ "$?" != "0" ]; then return 1 @@ -682,7 +684,7 @@ oneway_link_corruption() # # Step1: add OU "dangling-ou" # - ldif=$PREFIX_ABS/${RELEASE}/oneway_link_corruption.ldif + ldif=$PREFIX/${RELEASE}/oneway_link_corruption.ldif cat >$ldif <$ldif <$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-after-dbcheck-oneway-link-corruption.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(|(ou=dangling-ou)(ou=dangling-ou2)(ou=dangling-from))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted seeAlso >$tmpldif diff -u $tmpldif $release_dir/expected-after-dbcheck-oneway-link-corruption.ldif if [ "$?" != "0" ]; then return 1 @@ -744,7 +746,7 @@ check_expected_after_dbcheck_oneway_link_corruption() dbcheck_dangling_multi_valued() { - $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --selftest-check-expired-tombstones --fix --yes + $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --selftest-check-expired-tombstones --fix --yes if [ "$?" != "1" ]; then return 1 fi @@ -752,12 +754,12 @@ dbcheck_dangling_multi_valued() dangling_multi_valued_check_missing() { - WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(samaccountname=dangling-multi2)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) + WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(samaccountname=dangling-multi2)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) if [ $WORDS -ne 4 ]; then echo Got only $WORDS links for dangling-multi2 return 1 fi - WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(samaccountname=dangling-multi3)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) + WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(samaccountname=dangling-multi3)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) if [ $WORDS -ne 4 ]; then echo Got only $WORDS links for dangling-multi3 return 1 @@ -766,20 +768,20 @@ dangling_multi_valued_check_missing() dangling_multi_valued_check_equal_or_too_many() { - WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(samaccountname=dangling-multi1)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) + WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(samaccountname=dangling-multi1)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) if [ $WORDS -ne 4 ]; then echo Got $WORDS links for dangling-multi1 return 1 fi - WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(samaccountname=dangling-multi5)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) + WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(samaccountname=dangling-multi5)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) if [ $WORDS -ne 0 ]; then echo Got $WORDS links for dangling-multi5 return 1 fi - WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(samaccountname=Administrator)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) + WORDS=$(TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(samaccountname=Administrator)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted msDS-RevealedDSAs | grep msDS-RevealedDSAs | wc -l) if [ $WORDS -ne 2 ]; then echo Got $WORDS links for Administrator @@ -793,7 +795,7 @@ dangling_link_does_not_prevent_delete() # # Step1: add user "dangling" # - ldif=$PREFIX_ABS/${RELEASE}/backlink_can_be_vanished1.ldif + ldif=$PREFIX/${RELEASE}/backlink_can_be_vanished1.ldif dn='CN=dangling-for-vanish,CN=users,DC=release-4-5-0-pre1,DC=samba,DC=corp' cat >$ldif <;;CN=Enterprise Admins,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp" } >$ldif - out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) + out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) if [ "$?" != "0" ]; then echo "ldbmodify returned:\n$out" return 1 fi - out=$(TZ=UTC $ldbdel -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$dn") + out=$(TZ=UTC $ldbdel -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$dn") if [ "$?" != "0" ]; then echo "ldbdel returned:\n$out" return 1 @@ -840,7 +842,7 @@ dangling_link_to_unknown_does_not_prevent_delete() # # Step1: add user "dangling" # - ldif=$PREFIX_ABS/${RELEASE}/backlink_can_be_vanished1.ldif + ldif=$PREFIX/${RELEASE}/backlink_can_be_vanished1.ldif dn='CN=dangling-for-vanish,CN=users,DC=release-4-5-0-pre1,DC=samba,DC=corp' cat >$ldif <;;CN=NOT Enterprise Admins,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp" } >$ldif - out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) + out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) if [ "$?" != "0" ]; then echo "ldbmodify returned:\n$out" return 1 fi - out=$(TZ=UTC $ldbdel -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$dn") + out=$(TZ=UTC $ldbdel -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$dn") if [ "$?" != "0" ]; then echo "ldbdel returned:\n$out" return 1 @@ -887,7 +889,7 @@ dangling_link_to_known_and_unknown_does_not_prevent_delete() # # Step1: add user "dangling" # - ldif=$PREFIX_ABS/${RELEASE}/backlink_can_be_vanished1.ldif + ldif=$PREFIX/${RELEASE}/backlink_can_be_vanished1.ldif dn='CN=dangling-for-vanish,CN=users,DC=release-4-5-0-pre1,DC=samba,DC=corp' cat >$ldif <;CN=dangling-for-vanish,CN=users,DC=release-4-5-0-pre1,DC=samba,DC=corp" } >$ldif - out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) + out=$(TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif) if [ "$?" != "0" ]; then echo "ldbmodify returned:\n$out" return 1 fi - out=$(TZ=UTC $ldbdel -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$dn") + out=$(TZ=UTC $ldbdel -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$dn") if [ "$?" != "0" ]; then echo "ldbdel returned:\n$out" return 1 fi } -remove_directory $PREFIX_ABS/${RELEASE} +remove_directory $PREFIX/${RELEASE} testit $RELEASE undump || failed=$(expr $failed + 1) testit_expect_failure "dbcheck_acl_reset" dbcheck_acl_reset || failed=$(expr $failed + 1) @@ -998,6 +1000,6 @@ testit "dangling_link_does_not_prevent_delete" dangling_link_does_not_prevent_de testit "dangling_link_to_unknown_does_not_prevent_delete" dangling_link_to_unknown_does_not_prevent_delete || failed=$(expr $failed + 1) testit "dangling_link_to_known_and_unknown_does_not_prevent_delete" dangling_link_to_known_and_unknown_does_not_prevent_delete || failed=$(expr $failed + 1) -remove_directory $PREFIX_ABS/${RELEASE} +remove_directory $PREFIX/${RELEASE} exit $failed diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh index 73f7ec4676b..a008b81a4a1 100755 --- a/testprogs/blackbox/dbcheck-oldrelease.sh +++ b/testprogs/blackbox/dbcheck-oldrelease.sh @@ -7,7 +7,7 @@ EOF exit 1 fi -PREFIX_ABS="$1" +PREFIX="$1" RELEASE="$2" shift 2 @@ -108,13 +108,13 @@ fi undump() { - $samba_undump $release_dir $PREFIX_ABS/$RELEASE $samba_tdbrestore + $samba_undump $release_dir $PREFIX/$RELEASE $samba_tdbrestore } add_userparameters0() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb <$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-userParameters-after-dbcheck.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb userParameters=* --scope=sub -b DC=release-4-1-0rc3,DC=samba,DC=corp userParameters --sorted | grep -v \# >$tmpldif diff -u $tmpldif $release_dir/expected-userParameters-after-dbcheck.ldif if [ "$?" != "0" ]; then return 1 @@ -233,7 +233,7 @@ check_expected_userparameters() reindex() { - $PYTHON $BINDIR/samba-tool dbcheck --reindex -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --reindex -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$@" } do_current_version_mod() @@ -243,7 +243,7 @@ do_current_version_mod() # changing the attribute with current Samba fixes it, and that # a fixed attriute isn't unfixed by dbcheck. tmpldif=$release_dir/sudoers2-mod.ldif - $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $tmpldif + $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb $tmpldif fi return 0 } @@ -251,14 +251,14 @@ do_current_version_mod() check_expected_before_values() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - tmpldif=$PREFIX_ABS/$RELEASE/expected-replpropertymetadata-before-dbcheck.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-replpropertymetadata-before-dbcheck.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=ops_run_anything --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary >$tmpldif diff -u $tmpldif $release_dir/expected-replpropertymetadata-before-dbcheck.ldif if [ "$?" != "0" ]; then return 1 fi - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything2 --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary | grep -v originating_change_time | grep -v whenChanged >$tmpldif + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=ops_run_anything2 --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary | grep -v originating_change_time | grep -v whenChanged >$tmpldif # Here we remove originating_change_time and whenChanged as # these are time-dependent, caused by the ldbmodify above. @@ -268,14 +268,14 @@ check_expected_before_values() return 1 fi - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything3 --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary >$tmpldif + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=ops_run_anything3 --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary >$tmpldif diff -u $tmpldif $release_dir/expected-replpropertymetadata-before-dbcheck3.ldif if [ "$?" != "0" ]; then return 1 fi elif [ x$RELEASE = x"release-4-5-0-pre1" ]; then - tmpldif=$PREFIX_ABS/$RELEASE/rootdse-version.initial.txt.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif + tmpldif=$PREFIX/$RELEASE/rootdse-version.initial.txt.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif diff -u $tmpldif $release_dir/rootdse-version.initial.txt if [ "$?" != "0" ]; then return 1 @@ -288,7 +288,7 @@ check_expected_before_values() dbcheck_objectclass() { if [ x$RELEASE = x"release-4-1-6-partial-object" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --attrs=objectclass "$@" + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --attrs=objectclass "$@" else return 1 fi @@ -298,9 +298,9 @@ dbcheck_objectclass() dbcheck_deleted_objects() { if [ x$RELEASE = x"alpha13" ]; then - basedn=$($ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --scope base -b "" defaultNamingContext | grep -i defaultNamingContext | cut -d\ -f 2) + basedn=$($ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --scope base -b "" defaultNamingContext | grep -i defaultNamingContext | cut -d\ -f 2) - $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "cn=deleted objects,$basedn" --scope base "$@" + $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "cn=deleted objects,$basedn" --scope base "$@" else return 1 fi @@ -309,45 +309,45 @@ dbcheck_deleted_objects() # This should 'fail', because it returns the number of modified records dbcheck() { - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$@" } check_expected_after_values() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - tmpldif=$PREFIX_ABS/$RELEASE/expected-replpropertymetadata-after-dbcheck.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-replpropertymetadata-after-dbcheck.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=ops_run_anything --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary >$tmpldif diff -u $tmpldif $release_dir/expected-replpropertymetadata-after-dbcheck.ldif if [ "$?" != "0" ]; then return 1 fi - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything2 --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary | grep -v originating_change_time | grep -v whenChanged >$tmpldif + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=ops_run_anything2 --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary | grep -v originating_change_time | grep -v whenChanged >$tmpldif diff -u $tmpldif $release_dir/expected-replpropertymetadata-after-dbcheck2.ldif if [ "$?" != "0" ]; then return 1 fi - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=ops_run_anything3 --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary >$tmpldif + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=ops_run_anything3 --scope=one -b OU=SUDOers,DC=release-4-1-0rc3,DC=samba,DC=corp \* replpropertymetadata --sorted --show-binary >$tmpldif diff -u $tmpldif $release_dir/expected-replpropertymetadata-after-dbcheck3.ldif if [ "$?" != "0" ]; then return 1 fi # Check DomainDNS partition for replica locations - tmpldif=$PREFIX_ABS/$RELEASE/expected-replica-locations-after-dbcheck.ldif.tmp - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=49a69498-9a85-48af-9be4-aa0b3e0054f9 --scope=one -b CN=Partitions,CN=Configuration,DC=release-4-1-0rc3,DC=samba,DC=corp msDS-NC-Replica-Locations >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-replica-locations-after-dbcheck.ldif.tmp + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=49a69498-9a85-48af-9be4-aa0b3e0054f9 --scope=one -b CN=Partitions,CN=Configuration,DC=release-4-1-0rc3,DC=samba,DC=corp msDS-NC-Replica-Locations >$tmpldif diff -u $tmpldif $release_dir/expected-replica-locations-after-dbcheck.ldif if [ "$?" != "0" ]; then return 1 fi # Check ForestDNS partition for replica locations - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=7d2a15af-c0d4-487c-847e-e036292bcc65 --scope=one -b CN=Partitions,CN=Configuration,DC=release-4-1-0rc3,DC=samba,DC=corp msDS-NC-Replica-Locations >$tmpldif + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=7d2a15af-c0d4-487c-847e-e036292bcc65 --scope=one -b CN=Partitions,CN=Configuration,DC=release-4-1-0rc3,DC=samba,DC=corp msDS-NC-Replica-Locations >$tmpldif diff -u $tmpldif $release_dir/expected-replica-locations-after-dbcheck2.ldif if [ "$?" != "0" ]; then return 1 fi elif [ x$RELEASE = x"release-4-5-0-pre1" ]; then echo $RELEASE checking after values - tmpldif=$PREFIX_ABS/$RELEASE/expected-links-after-dbcheck.ldif.tmp - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --show-recycled --show-deleted --show-deactivated-link --reveal member memberOf lastKnownParent objectCategory lastKnownParent wellKnownObjects legacyExchangeDN sAMAccountType uSNChanged --sorted >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-links-after-dbcheck.ldif.tmp + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --show-recycled --show-deleted --show-deactivated-link --reveal member memberOf lastKnownParent objectCategory lastKnownParent wellKnownObjects legacyExchangeDN sAMAccountType uSNChanged --sorted >$tmpldif diff -u $tmpldif $release_dir/expected-links-after-dbcheck.ldif if [ "$?" != "0" ]; then return 1 @@ -355,8 +355,8 @@ check_expected_after_values() # If in the future dbcheck has to make a change recorded in replPropertyMetadata, # this test will fail and can be removed. - tmpversion=$PREFIX_ABS/$RELEASE/rootdse-version.final.txt.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpversion + tmpversion=$PREFIX/$RELEASE/rootdse-version.final.txt.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpversion diff -u $tmpversion $release_dir/rootdse-version.final.txt if [ "$?" != "0" ]; then return 1 @@ -369,7 +369,7 @@ check_forced_duplicate_values() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then ldif=$release_dir/forced-duplicate-value-for-dbcheck.ldif - TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb $ldif + TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb $ldif if [ "$?" != "0" ]; then return 1 fi @@ -382,7 +382,7 @@ check_forced_duplicate_values() dbcheck_after_dup() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=administrator,cn=users,DC=release-4-1-0rc3,DC=samba,DC=corp "$@" + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --fix --yes -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=administrator,cn=users,DC=release-4-1-0rc3,DC=samba,DC=corp "$@" else return 1 fi @@ -391,8 +391,8 @@ dbcheck_after_dup() check_expected_after_dup_values() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - tmpldif=$PREFIX_ABS/$RELEASE/expected-otherphone-after-dbcheck.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=administrator --scope=base -b cn=administrator,cn=users,DC=release-4-1-0rc3,DC=samba,DC=corp otherHomePhone --sorted --show-binary | grep -v \# | sort >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-otherphone-after-dbcheck.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=administrator --scope=base -b cn=administrator,cn=users,DC=release-4-1-0rc3,DC=samba,DC=corp otherHomePhone --sorted --show-binary | grep -v \# | sort >$tmpldif diff -u $tmpldif $release_dir/expected-otherphone-after-dbcheck.ldif if [ "$?" != "0" ]; then return 1 @@ -404,21 +404,21 @@ check_expected_after_dup_values() # But having fixed it all up, this should pass dbcheck_clean() { - $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$@" } # This should 'fail', because it returns the number of modified records. # We need to run this against all versions without adprep 2016 (before Samba 4.19) dbcheck_acl_reset() { - $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs --fix --yes -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$@" } # But having fixed it all up, this should pass. # We don't need to run this against 4.1.0rc3 dbcheck_acl_reset_clean() { if [ x$RELEASE != x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$@" fi } @@ -426,7 +426,7 @@ dbcheck_acl_reset_clean() dbcheck2() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$@" else exit 1 fi @@ -435,14 +435,14 @@ dbcheck2() dbcheck_clean2() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$@" fi } rm_deleted_objects() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - TZ=UTC $ldbdel -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb 'CN=Deleted Objects,DC=RELEASE-4-1-0RC3,DC=SAMBA,DC=CORP' + TZ=UTC $ldbdel -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-1-0RC3,DC%3DSAMBA,DC%3DCORP.ldb 'CN=Deleted Objects,DC=RELEASE-4-1-0RC3,DC=SAMBA,DC=CORP' if [ "$?" != "0" ]; then return 1 fi @@ -454,7 +454,7 @@ rm_deleted_objects() dbcheck3() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$@" else exit 1 fi @@ -463,15 +463,15 @@ dbcheck3() dbcheck_clean3() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs -H tdb://$PREFIX/${RELEASE}/private/sam.ldb "$@" fi } check_expected_after_deleted_objects() { if [ x$RELEASE = x"release-4-1-0rc3" ]; then - tmpldif=$PREFIX_ABS/$RELEASE/expected-deleted_objects-after-dbcheck.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb cn=deleted\ objects --scope=base -b cn=deleted\ objects,DC=release-4-1-0rc3,DC=samba,DC=corp objectClass description isDeleted isCriticalSystemObject objectGUID showInAdvancedViewOnly systemFlags --sorted --show-binary --show-deleted | grep -v \# | sort >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-deleted_objects-after-dbcheck.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb cn=deleted\ objects --scope=base -b cn=deleted\ objects,DC=release-4-1-0rc3,DC=samba,DC=corp objectClass description isDeleted isCriticalSystemObject objectGUID showInAdvancedViewOnly systemFlags --sorted --show-binary --show-deleted | grep -v \# | sort >$tmpldif diff -u $tmpldif $release_dir/expected-deleted_objects-after-dbcheck.ldif if [ "$?" != "0" ]; then return 1 @@ -483,28 +483,28 @@ check_expected_after_deleted_objects() referenceprovision() { if [ x$RELEASE = x"release-4-0-0" ]; then - $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003 --base-schema=2008_R2_old + $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX/${RELEASE}_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003 --base-schema=2008_R2_old # on top of this, also apply 2008R2 changes we accidentally missed in the past - $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --ldf-file=samba-4.7-missing-for-schema45.ldif,fix-forest-rev.ldf + $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --ldf-file=samba-4.7-missing-for-schema45.ldif,fix-forest-rev.ldf fi } ldapcmp() { if [ x$RELEASE = x"release-4-0-0" ]; then - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord,displayName,msDS-SupportedEncryptionTypes,servicePrincipalName + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX/${RELEASE}/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord,displayName,msDS-SupportedEncryptionTypes,servicePrincipalName fi } ldapcmp_sd() { if [ x$RELEASE = x"release-4-0-0" ]; then - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --sd --skip-missing-dn --filter=servicePrincipalName + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX/${RELEASE}/private/sam.ldb --two --sd --skip-missing-dn --filter=servicePrincipalName fi } -remove_directory $PREFIX_ABS/${RELEASE}_reference +remove_directory $PREFIX/${RELEASE}_reference testit $RELEASE undump || failed=$(expr $failed + 1) testit "reindex" reindex || failed=$(expr $failed + 1) @@ -538,10 +538,10 @@ testit "referenceprovision" referenceprovision || failed=$(expr $failed + 1) testit "ldapcmp" ldapcmp || failed=$(expr $failed + 1) testit "ldapcmp_sd" ldapcmp_sd || failed=$(expr $failed + 1) -if [ -d $PREFIX_ABS/${RELEASE} ]; then - rm -fr $PREFIX_ABS/${RELEASE} +if [ -d $PREFIX/${RELEASE} ]; then + rm -fr $PREFIX/${RELEASE} fi -remove_directory $PREFIX_ABS/${RELEASE}_reference +remove_directory $PREFIX/${RELEASE}_reference exit $failed diff --git a/testprogs/blackbox/demote-saveddb.sh b/testprogs/blackbox/demote-saveddb.sh index 4af9e977e00..defa0f5126c 100755 --- a/testprogs/blackbox/demote-saveddb.sh +++ b/testprogs/blackbox/demote-saveddb.sh @@ -7,7 +7,7 @@ EOF exit 1 fi -PREFIX_ABS="$1" +PREFIX="$1" shift 1 failed=0 @@ -54,15 +54,15 @@ fi undump() { - $SRCDIR_ABS/source4/selftest/provisions/undump.sh $samba_tree_dir $PREFIX_ABS $samba_tdbrestore + $SRCDIR_ABS/source4/selftest/provisions/undump.sh $samba_tree_dir $PREFIX $samba_tdbrestore } demote() { - $PYTHON $BINDIR/samba-tool domain demote -H tdb://$PREFIX_ABS/private/sam.ldb --remove-other-dead-server=$1 + $PYTHON $BINDIR/samba-tool domain demote -H tdb://$PREFIX/private/sam.ldb --remove-other-dead-server=$1 } -remove_directory $PREFIX_ABS +remove_directory $PREFIX testit "undump" undump || failed=$(expr $failed + 1) testit "demote-q-0-0" demote "q-0-0" || failed=$(expr $failed + 1) @@ -72,6 +72,6 @@ testit_expect_failure "demote-q-0-1" demote "q-0-1" || failed=$(expr $failed + 1 testit "demote-q-1-0" demote "q-1-0" || failed=$(expr $failed + 1) testit "demote-q-1-1" demote "q-1-1" || failed=$(expr $failed + 1) -remove_directory $PREFIX_ABS +remove_directory $PREFIX exit $failed diff --git a/testprogs/blackbox/functionalprep.sh b/testprogs/blackbox/functionalprep.sh index 94099f46d12..caf0d77d0d9 100755 --- a/testprogs/blackbox/functionalprep.sh +++ b/testprogs/blackbox/functionalprep.sh @@ -7,7 +7,7 @@ EOF exit 1 fi -PREFIX_ABS="$1" +PREFIX="$1" shift 1 failed=0 @@ -46,39 +46,39 @@ 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 + remove_directory $PREFIX/2012R2_schema + remove_directory $PREFIX/2019_schema + remove_directory $PREFIX/$RELEASE + remove_directory $PREFIX/$OLD_RELEASE } undump() { - $samba_undump $release_dir $PREFIX_ABS/$RELEASE $samba_tdbrestore + $samba_undump $release_dir $PREFIX/$RELEASE $samba_tdbrestore } undump_old() { - $samba_undump $old_release_dir $PREFIX_ABS/$OLD_RELEASE $samba_tdbrestore + $samba_undump $old_release_dir $PREFIX/$OLD_RELEASE $samba_tdbrestore } PROVISION_OPTS="--use-ntvfs --host-ip6=::1 --host-ip=127.0.0.1" provision_schema_2019_prep_skip() { - $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=REALM --realm=REALM.COM --targetdir=$PREFIX_ABS/2019_schema --base-schema=2019 --adprep-level=SKIP --host-name=FLPREP + $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=REALM --realm=REALM.COM --targetdir=$PREFIX/2019_schema --base-schema=2019 --adprep-level=SKIP --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 + $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=REALM --realm=REALM.COM --targetdir=$PREFIX/2012R2_schema --base-schema=2012_R2 --host-name=FLPREP } ldapcmp_ignore() { # At some point we will need to ignore, but right now, it should be perfect IGNORE_ATTRS=$1 - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/$2/private/sam.ldb tdb://$PREFIX_ABS/$3/private/sam.ldb --two --skip-missing-dn --filter msDS-SupportedEncryptionTypes,servicePrincipalName + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/$2/private/sam.ldb tdb://$PREFIX/$3/private/sam.ldb --two --skip-missing-dn --filter msDS-SupportedEncryptionTypes,servicePrincipalName } ldapcmp() @@ -90,13 +90,13 @@ ldapcmp() functional_prep_2016() { - $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/2019_schema/private/sam.ldb --function-level=2016 + $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX/2019_schema/private/sam.ldb --function-level=2016 } level_raise_2012R2() { $PYTHON $BINDIR/samba-tool domain level raise \ - -H tdb://$PREFIX_ABS/2019_schema/private/sam.ldb \ + -H tdb://$PREFIX/2019_schema/private/sam.ldb \ --option="ad dc functional level = 2012_R2" \ --domain-level=2012_R2 --forest-level=2012_R2 } @@ -104,41 +104,41 @@ level_raise_2012R2() level_raise_2016() { $PYTHON $BINDIR/samba-tool domain level raise \ - -H tdb://$PREFIX_ABS/2019_schema/private/sam.ldb \ + -H tdb://$PREFIX/2019_schema/private/sam.ldb \ --option="ad dc functional level = 2016" \ --domain-level=2016 --forest-level=2016 } functional_prep_2012R2() { - $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/2012R2_schema/private/sam.ldb --function-level=2012_R2 + $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX/2012R2_schema/private/sam.ldb --function-level=2012_R2 } functional_prep_2012R2_old() { - $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --function-level=2012_R2 + $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX/$OLD_RELEASE/private/sam.ldb --function-level=2012_R2 } functional_prep_2016_old() { - $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --function-level=2016 + $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX/$OLD_RELEASE/private/sam.ldb --function-level=2016 } steal_roles() { # Must steal schema master and infrastructure roles first - $PYTHON $BINDIR/samba-tool fsmo seize --role=schema -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --force - $PYTHON $BINDIR/samba-tool fsmo seize --role=infrastructure -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --force + $PYTHON $BINDIR/samba-tool fsmo seize --role=schema -H tdb://$PREFIX/$OLD_RELEASE/private/sam.ldb --force + $PYTHON $BINDIR/samba-tool fsmo seize --role=infrastructure -H tdb://$PREFIX/$OLD_RELEASE/private/sam.ldb --force } schema_upgrade_2012R2_old() { - $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --schema=2012_R2 + $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX/$OLD_RELEASE/private/sam.ldb --schema=2012_R2 } schema_upgrade_2019_old() { - $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --schema=2019 + $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX/$OLD_RELEASE/private/sam.ldb --schema=2019 } # double-check we cleaned up from the last test run diff --git a/testprogs/blackbox/join_ldapcmp.sh b/testprogs/blackbox/join_ldapcmp.sh index 3e5b264e7d7..83afa46f258 100755 --- a/testprogs/blackbox/join_ldapcmp.sh +++ b/testprogs/blackbox/join_ldapcmp.sh @@ -3,7 +3,7 @@ . $(dirname $0)/subunit.sh -TARGET_DIR="$PREFIX_ABS/join_$SERVER" +TARGET_DIR="$PREFIX/join_$SERVER" cleanup_output_dir() { @@ -28,7 +28,7 @@ demote_joined_dc() ldapcmp_result() { - DB1_PATH="tdb://$PREFIX_ABS/$SERVER/private/sam.ldb" + DB1_PATH="tdb://$PREFIX/$SERVER/private/sam.ldb" DB2_PATH="tdb://$TARGET_DIR/private/sam.ldb" # interSiteTopologyGenerator gets periodically updated. With the restored diff --git a/testprogs/blackbox/ldapcmp_restoredc.sh b/testprogs/blackbox/ldapcmp_restoredc.sh index 606ef72dea1..525be3f6e5a 100755 --- a/testprogs/blackbox/ldapcmp_restoredc.sh +++ b/testprogs/blackbox/ldapcmp_restoredc.sh @@ -9,8 +9,8 @@ EOF exit 1 fi -ORIG_DC_PREFIX_ABS="$1" -RESTORED_DC_PREFIX_ABS="$2" +ORIG_DC_PREFIX="$1" +RESTORED_DC_PREFIX="$2" shift 2 . $(dirname $0)/subunit.sh @@ -27,8 +27,8 @@ basedn() ldapcmp_with_orig() { - DB1_PATH="tdb://$ORIG_DC_PREFIX_ABS/private/sam.ldb" - DB2_PATH="tdb://$RESTORED_DC_PREFIX_ABS/private/sam.ldb" + DB1_PATH="tdb://$ORIG_DC_PREFIX/private/sam.ldb" + DB2_PATH="tdb://$RESTORED_DC_PREFIX/private/sam.ldb" # check if the 2 DCs are in different domains DC1_BASEDN=$(basedn $DB1_PATH) diff --git a/testprogs/blackbox/runtime-links.sh b/testprogs/blackbox/runtime-links.sh index 9cb49e4e645..04d080a68b1 100755 --- a/testprogs/blackbox/runtime-links.sh +++ b/testprogs/blackbox/runtime-links.sh @@ -7,7 +7,7 @@ EOF exit 1 fi -PREFIX_ABS="$1" +PREFIX="$1" RELEASE="$2" shift 2 @@ -35,7 +35,7 @@ fi delete_member_of_deleted_group() { - TZ=UTC $ldbdel -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb 'CN=User1 UT. Tester,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' + TZ=UTC $ldbdel -H tdb://$PREFIX/${RELEASE}/private/sam.ldb 'CN=User1 UT. Tester,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' if [ "$?" != "0" ]; then return 1 fi @@ -43,7 +43,7 @@ delete_member_of_deleted_group() delete_backlink_memberof_deleted_group() { - TZ=UTC $ldbdel -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb 'CN=User UT. Tester,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' + TZ=UTC $ldbdel -H tdb://$PREFIX/${RELEASE}/private/sam.ldb 'CN=User UT. Tester,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' if [ "$?" != "0" ]; then return 1 fi @@ -51,13 +51,13 @@ delete_backlink_memberof_deleted_group() delete_dangling_backlink_memberof_group() { - TZ=UTC $ldbdel -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb 'CN=dangling-back,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' + TZ=UTC $ldbdel -H tdb://$PREFIX/${RELEASE}/private/sam.ldb 'CN=dangling-back,CN=Users,DC=release-4-5-0-pre1,DC=samba,DC=corp' if [ "$?" != "0" ]; then return 1 fi } -remove_directory $PREFIX_ABS/${RELEASE} +remove_directory $PREFIX/${RELEASE} testit $RELEASE undump || failed=$(expr $failed + 1) testit "add_dangling_link" add_dangling_link || failed=$(expr $failed + 1) @@ -77,6 +77,6 @@ testit "delete_member_of_deleted_group" delete_member_of_deleted_group || failed testit "delete_backlink_memberof_deleted_group" delete_backlink_memberof_deleted_group || failed=$(expr $failed + 1) testit "delete_dangling_backlink_memberof_group" delete_dangling_backlink_memberof_group || failed=$(expr $failed + 1) -remove_directory $PREFIX_ABS/${RELEASE} +remove_directory $PREFIX/${RELEASE} exit $failed diff --git a/testprogs/blackbox/schemaupgrade.sh b/testprogs/blackbox/schemaupgrade.sh index 236a0bb754f..ce02f9bc624 100755 --- a/testprogs/blackbox/schemaupgrade.sh +++ b/testprogs/blackbox/schemaupgrade.sh @@ -7,19 +7,19 @@ EOF exit 1 fi -PREFIX_ABS="$1" +PREFIX="$1" shift 1 . $(dirname $0)/subunit.sh cleanup_output_directories() { - if [ -d $PREFIX_ABS/2012R2_schema ]; then - rm -fr $PREFIX_ABS/2012R2_schema + if [ -d $PREFIX/2012R2_schema ]; then + rm -fr $PREFIX/2012R2_schema fi - if [ -d $PREFIX_ABS/2008R2_schema ]; then - rm -fr $PREFIX_ABS/2008R2_schema + if [ -d $PREFIX/2008R2_schema ]; then + rm -fr $PREFIX/2008R2_schema fi } @@ -27,17 +27,17 @@ PROVISION_OPTS="--use-ntvfs --host-ip6=::1 --host-ip=127.0.0.1" provision_2012r2() { - $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=SAMBA --realm=w2012r2.samba.corp --targetdir=$PREFIX_ABS/2012R2_schema --base-schema=2012_R2 --adprep-level=SKIP + $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=SAMBA --realm=w2012r2.samba.corp --targetdir=$PREFIX/2012R2_schema --base-schema=2012_R2 --adprep-level=SKIP } provision_2008r2() { - $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=SAMBA --realm=w2008r2.samba.corp --targetdir=$PREFIX_ABS/2008R2_schema --base-schema=2008_R2 + $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=SAMBA --realm=w2008r2.samba.corp --targetdir=$PREFIX/2008R2_schema --base-schema=2008_R2 } provision_2008r2_old() { - $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=SAMBA --realm=w2008r2.samba.corp --targetdir=$PREFIX_ABS/2008R2_old_schema --base-schema=2008_R2_old + $PYTHON $BINDIR/samba-tool domain provision $PROVISION_OPTS --domain=SAMBA --realm=w2008r2.samba.corp --targetdir=$PREFIX/2008R2_old_schema --base-schema=2008_R2_old } ldapcmp_ignore() @@ -54,7 +54,7 @@ ldapcmp_ignore() # objects, but we don't have the 2012 DisplaySpecifiers documentation... IGNORE_ATTRS="$IGNORE_ATTRS,adminContextMenu,adminPropertyPages" - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/$2_schema/private/sam.ldb tdb://$PREFIX_ABS/$3_schema/private/sam.ldb --two --filter=$IGNORE_ATTRS --skip-missing-dn + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/$2_schema/private/sam.ldb tdb://$PREFIX/$3_schema/private/sam.ldb --two --filter=$IGNORE_ATTRS --skip-missing-dn } ldapcmp_old() @@ -92,12 +92,12 @@ ldapcmp_2008R2_2008R2_old() schema_upgrade() { - $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/2008R2_schema/private/sam.ldb --schema=2012_R2 + $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX/2008R2_schema/private/sam.ldb --schema=2012_R2 } schema_upgrade_old() { - $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/2008R2_old_schema/private/sam.ldb --schema=2012_R2 + $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX/2008R2_old_schema/private/sam.ldb --schema=2012_R2 } # double-check we cleaned up from the last test run diff --git a/testprogs/blackbox/test_client_etypes.sh b/testprogs/blackbox/test_client_etypes.sh index 0389cb39d67..88f47199cbd 100755 --- a/testprogs/blackbox/test_client_etypes.sh +++ b/testprogs/blackbox/test_client_etypes.sh @@ -1,6 +1,6 @@ if [ $# -lt 6 ]; then cat <$out testit_grep "find my dn" msDS-SupportedEncryptionTypes cat $out || failed=$(expr $failed + 1) @@ -34,7 +34,7 @@ my_dn=$(cat $out | sed -n 's/^dn: //p') my_encs=$(cat $out | sed -n 's/^msDS-SupportedEncryptionTypes: //p') my_test_encs=$(expr $my_encs + 3) -ldif="${PREFIX_ABS}/tmpldbmodify.ldif" +ldif="${PREFIX}/tmpldbmodify.ldif" cat >$ldif <$ldif <$tmpldif1 + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif1 - $PYTHON $BINDIR/samba-tool domain tombstones expunge -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --current-time=2016-07-30 --tombstone-lifetime=4 >$tmpfile + $PYTHON $BINDIR/samba-tool domain tombstones expunge -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --current-time=2016-07-30 --tombstone-lifetime=4 >$tmpfile if [ "$?" != "0" ]; then return 1 fi @@ -59,8 +59,8 @@ tombstones_expunge() return 1 fi - tmpldif2=$PREFIX_ABS/$RELEASE/expected-expunge-output2.txt.tmp2 - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif2 + tmpldif2=$PREFIX/$RELEASE/expected-expunge-output2.txt.tmp2 + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb --scope=base -b '' | grep highestCommittedUSN >$tmpldif2 diff -u $tmpldif1 $tmpldif2 if [ "$?" != "0" ]; then @@ -71,7 +71,7 @@ tombstones_expunge() add_dangling_link() { ldif=$release_dir/add-dangling-link.ldif - TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif + TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif if [ "$?" != "0" ]; then return 1 fi @@ -80,7 +80,7 @@ add_dangling_link() add_two_more_users() { ldif=$release_dir/add-two-more-users.ldif - TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif + TZ=UTC $ldbadd -H tdb://$PREFIX/${RELEASE}/private/sam.ldb $ldif if [ "$?" != "0" ]; then return 1 fi @@ -89,7 +89,7 @@ add_two_more_users() add_four_more_links() { ldif=$release_dir/add-four-more-links.ldif - TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif + TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb $ldif if [ "$?" != "0" ]; then return 1 fi @@ -98,12 +98,12 @@ add_four_more_links() add_unsorted_links() { ldif=$release_dir/add-unsorted-links-step1.ldif - TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif --relax + TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb $ldif --relax if [ "$?" != "0" ]; then return 1 fi ldif=$release_dir/add-unsorted-links-step2.ldif - TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif + TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif if [ "$?" != "0" ]; then return 1 fi @@ -112,7 +112,7 @@ add_unsorted_links() remove_one_link() { ldif=$release_dir/remove-one-more-link.ldif - TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif + TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb $ldif if [ "$?" != "0" ]; then return 1 fi @@ -121,7 +121,7 @@ remove_one_link() remove_one_user() { ldif=$release_dir/remove-one-more-user.ldif - TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif + TZ=UTC $ldbmodify -H tdb://$PREFIX/${RELEASE}/private/sam.ldb $ldif if [ "$?" != "0" ]; then return 1 fi @@ -129,8 +129,8 @@ remove_one_user() check_match_rule_links() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-match-rule-links.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=131139216000000000)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted no_attrs >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-match-rule-links.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=131139216000000000)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted no_attrs >$tmpldif diff -u $tmpldif $release_dir/expected-match-rule-links.ldif if [ "$?" != "0" ]; then return 1 @@ -139,48 +139,48 @@ check_match_rule_links() check_match_rule_links_negative() { - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=-131139216000000000)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=-131139216000000000)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member } check_match_rule_links_overflow() { - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=18446744073709551617)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=18446744073709551617)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member } check_match_rule_links_null() { - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=18446744\073709551617)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=18446744\073709551617)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member } check_match_rule_links_hex() { - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=abcd)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=abcd)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member } check_match_rule_links_hex2() { - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=0xabcd)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=0xabcd)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member } check_match_rule_links_decimal() { - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=131139216000000000.00)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(member:1.3.6.1.4.1.7165.4.5.2:=131139216000000000.00)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member } check_match_rule_links_backlink() { - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(memberOf:1.3.6.1.4.1.7165.4.5.2:=131139216000000000)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted memberOf + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(memberOf:1.3.6.1.4.1.7165.4.5.2:=131139216000000000)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted memberOf } check_match_rule_links_notlink() { - $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(samAccountName:1.3.6.1.4.1.7165.4.5.2:=131139216000000000)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted samAccountName + $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(samAccountName:1.3.6.1.4.1.7165.4.5.2:=131139216000000000)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted samAccountName } check_expected_after_links() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-links-after-expunge.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted member >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-links-after-expunge.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --sorted member >$tmpldif diff -u $tmpldif $release_dir/expected-links-after-expunge.ldif if [ "$?" != "0" ]; then return 1 @@ -189,8 +189,8 @@ check_expected_after_links() check_expected_after_deleted_links() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-deleted-links-after-expunge.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-deleted-links-after-expunge.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(|(cn=swimmers)(cn=leaders)(cn=helpers))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member >$tmpldif diff -u $tmpldif $release_dir/expected-deleted-links-after-expunge.ldif if [ "$?" != "0" ]; then return 1 @@ -199,8 +199,8 @@ check_expected_after_deleted_links() check_expected_after_objects() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-objects-after-expunge.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(|(samaccountname=fred)(samaccountname=ddg)(samaccountname=usg)(samaccountname=user1)(samaccountname=user2))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted samAccountName | grep sAMAccountName >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-objects-after-expunge.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(|(samaccountname=fred)(samaccountname=ddg)(samaccountname=usg)(samaccountname=user1)(samaccountname=user2))' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted samAccountName | grep sAMAccountName >$tmpldif diff -u $tmpldif $release_dir/expected-objects-after-expunge.ldif if [ "$?" != "0" ]; then return 1 @@ -209,15 +209,15 @@ check_expected_after_objects() check_expected_unsorted_links() { - tmpldif=$PREFIX_ABS/$RELEASE/expected-unsorted-links-after-expunge.ldif.tmp - TZ=UTC $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb '(name=unsorted-g)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member >$tmpldif + tmpldif=$PREFIX/$RELEASE/expected-unsorted-links-after-expunge.ldif.tmp + TZ=UTC $ldbsearch -H tdb://$PREFIX/${RELEASE}/private/sam.ldb '(name=unsorted-g)' --scope=sub -b DC=release-4-5-0-pre1,DC=samba,DC=corp --show-deleted --reveal --sorted member >$tmpldif diff -u $tmpldif $release_dir/expected-unsorted-links-after-expunge.ldif if [ "$?" != "0" ]; then return 1 fi } -remove_directory $PREFIX_ABS/${RELEASE} +remove_directory $PREFIX/${RELEASE} testit $RELEASE undump || failed=$(expr $failed + 1) testit "add_two_more_users" add_two_more_users || failed=$(expr $failed + 1) @@ -241,6 +241,6 @@ testit "check_expected_after_links" check_expected_after_links || failed=$(expr testit "check_expected_after_objects" check_expected_after_objects || failed=$(expr $failed + 1) testit "check_expected_unsorted_links" check_expected_unsorted_links || failed=$(expr $failed + 1) -remove_directory $PREFIX_ABS/${RELEASE} +remove_directory $PREFIX/${RELEASE} exit $failed diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh index e8267ea5c1f..228b3a5de0f 100755 --- a/testprogs/blackbox/upgradeprovision-oldrelease.sh +++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh @@ -7,7 +7,7 @@ EOF exit 1 fi -PREFIX_ABS="$1" +PREFIX="$1" RELEASE="$2" shift 2 @@ -98,118 +98,118 @@ fi undump() { - $samba_undump $release_dir $PREFIX_ABS/${RELEASE}_upgrade $samba_tdbrestore - $samba_undump $release_dir $PREFIX_ABS/${RELEASE}_upgrade_full $samba_tdbrestore + $samba_undump $release_dir $PREFIX/${RELEASE}_upgrade $samba_tdbrestore + $samba_undump $release_dir $PREFIX/${RELEASE}_upgrade_full $samba_tdbrestore - cp -a $release_dir/private/*.keytab $PREFIX_ABS/${RELEASE}_upgrade/private/ - cp -a $release_dir/sysvol $PREFIX_ABS/${RELEASE}_upgrade/ - mkdir $PREFIX_ABS/${RELEASE}_upgrade/etc/ - sed -e "s|@@PREFIX@@|$PREFIX_ABS/${RELEASE}_upgrade|g" $release_dir/etc/smb.conf.template \ - >$PREFIX_ABS/${RELEASE}_upgrade/etc/smb.conf + cp -a $release_dir/private/*.keytab $PREFIX/${RELEASE}_upgrade/private/ + cp -a $release_dir/sysvol $PREFIX/${RELEASE}_upgrade/ + mkdir $PREFIX/${RELEASE}_upgrade/etc/ + sed -e "s|@@PREFIX@@|$PREFIX/${RELEASE}_upgrade|g" $release_dir/etc/smb.conf.template \ + >$PREFIX/${RELEASE}_upgrade/etc/smb.conf - cp -a $release_dir/private/*.keytab $PREFIX_ABS/${RELEASE}_upgrade_full/private/ - cp -a $release_dir/sysvol $PREFIX_ABS/${RELEASE}_upgrade_full/ - mkdir $PREFIX_ABS/${RELEASE}_upgrade_full/etc/ - sed -e "s|@@PREFIX@@|$PREFIX_ABS/${RELEASE}_upgrade_full|g" $release_dir/etc/smb.conf.template \ - >$PREFIX_ABS/${RELEASE}_upgrade_full/etc/smb.conf + cp -a $release_dir/private/*.keytab $PREFIX/${RELEASE}_upgrade_full/private/ + cp -a $release_dir/sysvol $PREFIX/${RELEASE}_upgrade_full/ + mkdir $PREFIX/${RELEASE}_upgrade_full/etc/ + sed -e "s|@@PREFIX@@|$PREFIX/${RELEASE}_upgrade_full|g" $release_dir/etc/smb.conf.template \ + >$PREFIX/${RELEASE}_upgrade_full/etc/smb.conf } remove_dns_user() { if [ x$RELEASE != x"release-4-0-0" ]; then # This is done, because otherwise the upgrdeprovision will not run without --full - ${ldbdel} -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb cn=dns,cn=users,dc=${RELEASE},dc=samba,dc=corp + ${ldbdel} -H tdb://$PREFIX/${RELEASE}_upgrade/private/sam.ldb cn=dns,cn=users,dc=${RELEASE},dc=samba,dc=corp fi } reindex() { - $PYTHON $BINDIR/samba-tool dbcheck --reindex -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --reindex -H tdb://$PREFIX/${RELEASE}_upgrade/private/sam.ldb "$@" } # This should 'fail', because it returns the number of modified records dbcheck() { - $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs --fix --yes -H tdb://$PREFIX/${RELEASE}_upgrade/private/sam.ldb "$@" } dbcheck_clean() { - $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX/${RELEASE}_upgrade/private/sam.ldb "$@" } # This should 'fail', because it returns the number of modified records dbcheck_full() { - $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}_upgrade_full/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs --fix --yes -H tdb://$PREFIX/${RELEASE}_upgrade_full/private/sam.ldb "$@" } dbcheck_full_clean() { - $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}_upgrade_full/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX/${RELEASE}_upgrade_full/private/sam.ldb "$@" } # This checks that after the upgrade, the well known ACLs are correct, so this reset should not want to do anything dbcheck_full_clean_well_known_acls() { - $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}_upgrade_full/private/sam.ldb "$@" + $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs -H tdb://$PREFIX/${RELEASE}_upgrade_full/private/sam.ldb "$@" } upgradeprovision() { # bring the really old Samba schema in line with a more recent 2008R2 schema - $PYTHON $BINDIR/samba_upgradeprovision --configfile="$PREFIX_ABS/${RELEASE}_upgrade/etc/smb.conf" --debugchange + $PYTHON $BINDIR/samba_upgradeprovision --configfile="$PREFIX/${RELEASE}_upgrade/etc/smb.conf" --debugchange # on top of this, also apply 2008R2 changes we accidentally missed in the past - $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --ldf-file=samba-4.7-missing-for-schema45.ldif,fix-forest-rev.ldf + $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX/${RELEASE}_upgrade/private/sam.ldb --ldf-file=samba-4.7-missing-for-schema45.ldif,fix-forest-rev.ldf # add missing domain prep for 2008R2 - $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --domain --function-level 2008_R2 + $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX/${RELEASE}_upgrade/private/sam.ldb --domain --function-level 2008_R2 } upgradeprovision_full() { # add missing domain prep for 2008R2 - $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/${RELEASE}_upgrade_full/private/sam.ldb --domain --function-level 2008_R2 + $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX/${RELEASE}_upgrade_full/private/sam.ldb --domain --function-level 2008_R2 - $PYTHON $BINDIR/samba_upgradeprovision --configfile="$PREFIX_ABS/${RELEASE}_upgrade_full/etc/smb.conf" --full --debugchange + $PYTHON $BINDIR/samba_upgradeprovision --configfile="$PREFIX/${RELEASE}_upgrade_full/etc/smb.conf" --full --debugchange } samba_upgradedns() { - $PYTHON $BINDIR/samba_upgradedns --dns-backend=SAMBA_INTERNAL --configfile="$PREFIX_ABS/${RELEASE}_upgrade_full/etc/smb.conf" + $PYTHON $BINDIR/samba_upgradedns --dns-backend=SAMBA_INTERNAL --configfile="$PREFIX/${RELEASE}_upgrade_full/etc/smb.conf" } referenceprovision() { - $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_upgrade_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003 --base-schema=2008_R2_old + $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX/${RELEASE}_upgrade_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003 --base-schema=2008_R2_old } ldapcmp() { if [ x$RELEASE != x"alpha13" ]; then - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord,displayName,msDS-SupportedEncryptionTypes,servicePrincipalName + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX/${RELEASE}_upgrade/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord,displayName,msDS-SupportedEncryptionTypes,servicePrincipalName fi } ldapcmp_full() { - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}_upgrade_full/private/sam.ldb --two --filter=dNSProperty,dnsRecord,cn,displayName,versionNumber,systemFlags,msDS-HasInstantiatedNCs,servicePrincipalName --skip-missing-dn + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX/${RELEASE}_upgrade_full/private/sam.ldb --two --filter=dNSProperty,dnsRecord,cn,displayName,versionNumber,systemFlags,msDS-HasInstantiatedNCs,servicePrincipalName --skip-missing-dn } ldapcmp_sd() { - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --two --sd --skip-missing-dn + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX/${RELEASE}_upgrade/private/sam.ldb --two --sd --skip-missing-dn } ldapcmp_full_sd() { - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}_upgrade_full/private/sam.ldb --two --sd --skip-missing-dn + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX/${RELEASE}_upgrade_full/private/sam.ldb --two --sd --skip-missing-dn } -remove_directory $PREFIX_ABS/${RELEASE}_upgrade -remove_directory $PREFIX_ABS/${RELEASE}_upgrade_full -remove_directory $PREFIX_ABS/${RELEASE}_upgrade_reference +remove_directory $PREFIX/${RELEASE}_upgrade +remove_directory $PREFIX/${RELEASE}_upgrade_full +remove_directory $PREFIX/${RELEASE}_upgrade_reference testit $RELEASE undump || failed=$(expr $failed + 1) testit "remove_dns_user" remove_dns_user || failed=$(expr $failed + 1) @@ -227,8 +227,8 @@ testit "ldapcmp" ldapcmp || failed=$(expr $failed + 1) testit "ldapcmp_sd" ldapcmp_sd || failed=$(expr $failed + 1) testit "ldapcmp_full_sd" ldapcmp_full_sd || failed=$(expr $failed + 1) -remove_directory $PREFIX_ABS/${RELEASE}_upgrade -remove_directory $PREFIX_ABS/${RELEASE}_upgrade_full -remove_directory $PREFIX_ABS/${RELEASE}_upgrade_reference +remove_directory $PREFIX/${RELEASE}_upgrade +remove_directory $PREFIX/${RELEASE}_upgrade_full +remove_directory $PREFIX/${RELEASE}_upgrade_reference exit $failed -- 2.47.2