[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Thu Aug 4 13:50:01 UTC 2022
The branch, master has been updated
via 2120b215872 testprogs: Reformat test_ktpass.sh
via faf8c190b4a testprogs: Reformat test_kpasswd_mit.sh
via 9d1cf12da19 testprogs: Reformat test_kpasswd_heimdal.sh
via a68d75f9c19 testprogs: Reformat test_kinit_trusts_mit.sh
via ce97396ecb2 testprogs: Reformat test_kinit_trusts_heimdal.sh
via 8c19e475aac testprogs: Reformat test_kinit_mit.sh
via da0049b01d9 testprogs: Reformat test_kinit_heimdal.sh
via 848bf1bf592 testprogs: Reformat test_export_keytab_mit.sh
via 708582deefa testprogs: Reformat test_export_keytab_heimdal.sh
via fcdcad87816 testprogs: Reformat test_client_kerberos.sh
via 2c8681cca73 testprogs: Reformat test_client_etypes.sh
via f222b2a2296 testprogs: Reformat test_chgdcpass.sh
via 561e9256551 testprogs: Reformat subunit.sh
via de6335d47ab testprogs: Reformat schemaupgrade.sh
via a59460d2794 testprogs: Reformat runtime-links.sh
via 7b4e06d2255 testprogs: Reformat renamedc.sh
via d0f27918308 testprogs: Reformat nsstest.sh
via 084bddcf101 testprogs: Reformat ldapcmp_restoredc.sh
via 65b3797352c testprogs: Reformat join_ldapcmp.sh
via f2591ff727e testprogs: Reformat functionalprep.sh
via 91035d48f26 testprogs: Reformat dom_parse.sh
via eab5cdb66f4 testprogs: Reformat dfree.sh
via 9bc3ba8f379 testprogs: Reformat demote-saveddb.sh
from 0cdd204693b testprogs: Reformat dbcheck.sh
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2120b21587283be1c8eb75191403aa3c27f1b8f9
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_ktpass.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_ktpass.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Thu Aug 4 13:49:54 UTC 2022 on sn-devel-184
commit faf8c190b4a9fdce1300d2d027ba7c1f5fbd3e6b
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_kpasswd_mit.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_kpasswd_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 9d1cf12da19b762d58d7f0dd2d2a8abcbbce9cf0
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_kpasswd_heimdal.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_kpasswd_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit a68d75f9c19bf52f8cdecb3a4b187fbdc0de6c09
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_kinit_trusts_mit.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_kinit_trusts_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit ce97396ecb2a858dd32ed04e62cf19fdc87c40e5
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_kinit_trusts_heimdal.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_kinit_trusts_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 8c19e475aacb18206fe7d657090daefc5ae06331
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_kinit_mit.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_kinit_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit da0049b01d94898718144e15a068b68c679248e4
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_kinit_heimdal.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_kinit_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 848bf1bf59200131fa70b6810fa10de29198409c
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat test_export_keytab_mit.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_export_keytab_mit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 708582deefa99a28fcfa2412dce2f4b1282ea9d5
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat test_export_keytab_heimdal.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_export_keytab_heimdal.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit fcdcad878161c47d24d9be53a915356d29b07066
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat test_client_kerberos.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_client_kerberos.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 2c8681cca73bd3fa141b9833798284a6e450ab0e
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat test_client_etypes.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_client_etypes.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit f222b2a2296871c15a7ee00737e11af63325547e
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat test_chgdcpass.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_chgdcpass.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 561e9256551ae3fe1d6ff4974884714d69d91898
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat subunit.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/subunit.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit de6335d47ab6caca6217b7134845d521a3a10985
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat schemaupgrade.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/schemaupgrade.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit a59460d279462f842e9ac6cfad657d085a08b3bd
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat runtime-links.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/runtime-links.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 7b4e06d2255f16d42263fd42b48c153ceb6d2125
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat renamedc.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/renamedc.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit d0f27918308fca625c5cecfad205698fcdc8a8bc
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat nsstest.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/nsstest.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 084bddcf10196196d41d4ffdeaa726774ef77131
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat ldapcmp_restoredc.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/ldapcmp_restoredc.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 65b3797352c5f158c0c9c9bd624fed712d86792f
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat join_ldapcmp.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/join_ldapcmp.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit f2591ff727eba2e44252b1fa573f58bb58d157e7
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat functionalprep.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/functionalprep.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 91035d48f26b771a23b0d2c21804065a4ee11155
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat dom_parse.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/dom_parse.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit eab5cdb66f4c9760e9313fa160a4a973e75685e5
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat dfree.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/dfree.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
commit 9bc3ba8f3793d02f9ae529fd0992ed534a419e40
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat demote-saveddb.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/demote-saveddb.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
-----------------------------------------------------------------------
Summary of changes:
testprogs/blackbox/demote-saveddb.sh | 56 +++---
testprogs/blackbox/dfree.sh | 10 +-
testprogs/blackbox/dom_parse.sh | 10 +-
testprogs/blackbox/functionalprep.sh | 104 +++++-----
testprogs/blackbox/join_ldapcmp.sh | 35 ++--
testprogs/blackbox/ldapcmp_restoredc.sh | 72 +++----
testprogs/blackbox/nsstest.sh | 8 +-
testprogs/blackbox/renamedc.sh | 80 ++++----
testprogs/blackbox/runtime-links.sh | 83 ++++----
testprogs/blackbox/schemaupgrade.sh | 103 +++++-----
testprogs/blackbox/subunit.sh | 115 ++++++-----
testprogs/blackbox/test_chgdcpass.sh | 44 ++---
testprogs/blackbox/test_client_etypes.sh | 45 +++--
testprogs/blackbox/test_client_kerberos.sh | 239 ++++++++++++-----------
testprogs/blackbox/test_export_keytab_heimdal.sh | 43 ++--
testprogs/blackbox/test_export_keytab_mit.sh | 44 +++--
testprogs/blackbox/test_kinit_heimdal.sh | 134 +++++++------
testprogs/blackbox/test_kinit_mit.sh | 121 ++++++------
testprogs/blackbox/test_kinit_trusts_heimdal.sh | 52 ++---
testprogs/blackbox/test_kinit_trusts_mit.sh | 53 ++---
testprogs/blackbox/test_kpasswd_heimdal.sh | 57 +++---
testprogs/blackbox/test_kpasswd_mit.sh | 61 +++---
testprogs/blackbox/test_ktpass.sh | 15 +-
23 files changed, 818 insertions(+), 766 deletions(-)
Changeset truncated at 500 lines:
diff --git a/testprogs/blackbox/demote-saveddb.sh b/testprogs/blackbox/demote-saveddb.sh
index d8fccf32011..56ad136f667 100755
--- a/testprogs/blackbox/demote-saveddb.sh
+++ b/testprogs/blackbox/demote-saveddb.sh
@@ -1,10 +1,10 @@
#!/bin/sh
if [ $# -lt 1 ]; then
-cat <<EOF
+ cat <<EOF
Usage: demote.sh PREFIX RELEASE
EOF
-exit 1;
+ exit 1
fi
PREFIX_ABS="$1"
@@ -12,66 +12,68 @@ shift 1
failed=0
-. `dirname $0`/subunit.sh
-. `dirname $0`/common_test_fns.inc
+. $(dirname $0)/subunit.sh
+. $(dirname $0)/common_test_fns.inc
samba_tree_dir="$SRCDIR_ABS/source4/selftest/provisions/multi-dc-samba-master-c596ac6"
samba_tdbrestore="tdbrestore"
if [ -x $BINDIR/tdbrestore ]; then
- samba_tdbrestore="$BINDIR/tdbrestore"
+ samba_tdbrestore="$BINDIR/tdbrestore"
fi
# The undump script and the provision data is not part of release tarballs,
# skip the tests in this case!
samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh"
if [ ! -x $samba_undump ] || [ ! -d $samba_tree_dir ]; then
- subunit_start_test "undump"
- subunit_skip_test "undump" <<EOF
+ subunit_start_test "undump"
+ subunit_skip_test "undump" <<EOF
EOF
- subunit_start_test "undump"
- subunit_skip_test "undump" <<EOF
+ subunit_start_test "undump"
+ subunit_skip_test "undump" <<EOF
Skipping tests - no provision!
EOF
- subunit_start_test "demote-q-0-0"
- subunit_skip_test "demote-q-0-0" <<EOF
+ subunit_start_test "demote-q-0-0"
+ subunit_skip_test "demote-q-0-0" <<EOF
Skipping tests - no provision!
EOF
- subunit_start_test "demote-q-0-1"
- subunit_skip_test "demote-q-0-1" <<EOF
+ subunit_start_test "demote-q-0-1"
+ subunit_skip_test "demote-q-0-1" <<EOF
Skipping tests - no provision!
EOF
- subunit_start_test "demote-q-1-0"
- subunit_skip_test "demote-q-1-0" <<EOF
+ subunit_start_test "demote-q-1-0"
+ subunit_skip_test "demote-q-1-0" <<EOF
Skipping tests - no provision!
EOF
- subunit_start_test "demote-q-1-1"
- subunit_skip_test "demote-q-1-1" <<EOF
+ subunit_start_test "demote-q-1-1"
+ subunit_skip_test "demote-q-1-1" <<EOF
Skipping tests - no provision!
EOF
- exit 0
+ exit 0
fi
-undump() {
- $SRCDIR_ABS/source4/selftest/provisions/undump.sh $samba_tree_dir $PREFIX_ABS $samba_tdbrestore
+undump()
+{
+ $SRCDIR_ABS/source4/selftest/provisions/undump.sh $samba_tree_dir $PREFIX_ABS $samba_tdbrestore
}
-demote() {
- $PYTHON $BINDIR/samba-tool domain demote -H tdb://$PREFIX_ABS/private/sam.ldb --remove-other-dead-server=$1
+demote()
+{
+ $PYTHON $BINDIR/samba-tool domain demote -H tdb://$PREFIX_ABS/private/sam.ldb --remove-other-dead-server=$1
}
remove_directory $PREFIX_ABS
-testit "undump" undump || failed=`expr $failed + 1`
-testit "demote-q-0-0" demote "q-0-0" || failed=`expr $failed + 1`
+testit "undump" undump || failed=$(expr $failed + 1)
+testit "demote-q-0-0" demote "q-0-0" || failed=$(expr $failed + 1)
# The database was copied of q-0-1 so this will fail
# as we can't remove our own name
-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`
+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
diff --git a/testprogs/blackbox/dfree.sh b/testprogs/blackbox/dfree.sh
index 64845cd1784..893bc595040 100755
--- a/testprogs/blackbox/dfree.sh
+++ b/testprogs/blackbox/dfree.sh
@@ -1,8 +1,8 @@
#!/bin/sh
-if [ "$1" = "." ] ; then
- echo "1000 10 2048"
-elif [ "$1" = "subdir1" ] ; then
- echo "2000 20 4096"
+if [ "$1" = "." ]; then
+ echo "1000 10 2048"
+elif [ "$1" = "subdir1" ]; then
+ echo "2000 20 4096"
else
- echo "4000 40 8192"
+ echo "4000 40 8192"
fi
diff --git a/testprogs/blackbox/dom_parse.sh b/testprogs/blackbox/dom_parse.sh
index dd14f0d7ca9..8a22ce29732 100755
--- a/testprogs/blackbox/dom_parse.sh
+++ b/testprogs/blackbox/dom_parse.sh
@@ -4,10 +4,10 @@
# Copyright (C) 2006-2008 Andrew Bartlett <abartlet at samba.org>
if [ $# -lt 2 ]; then
-cat <<EOF
+ cat <<EOF
Usage: dom_parse.sh [id|getent] $USER
EOF
-exit 1;
+ exit 1
fi
USER=$2
@@ -16,12 +16,12 @@ EXTRA=""
shift 2
failed=0
-. `dirname $0`/subunit.sh
+. $(dirname $0)/subunit.sh
if [ "$CMD" = "getent" ]; then
- EXTRA="passwd"
+ EXTRA="passwd"
fi
-testit "samba4.winbind.dom_name_parse.cmd.$CMD" $CMD $EXTRA $USER || failed=`expr $failed + 1`
+testit "samba4.winbind.dom_name_parse.cmd.$CMD" $CMD $EXTRA $USER || failed=$(expr $failed + 1)
exit $failed
diff --git a/testprogs/blackbox/functionalprep.sh b/testprogs/blackbox/functionalprep.sh
index e9ab0854cff..9c68047d936 100755
--- a/testprogs/blackbox/functionalprep.sh
+++ b/testprogs/blackbox/functionalprep.sh
@@ -1,10 +1,10 @@
#!/bin/sh
if [ $# -lt 1 ]; then
-cat <<EOF
+ cat <<EOF
Usage: $0 PREFIX
EOF
-exit 1;
+ exit 1
fi
PREFIX_ABS="$1"
@@ -12,8 +12,8 @@ shift 1
failed=0
-. `dirname $0`/subunit.sh
-. `dirname $0`/common_test_fns.inc
+. $(dirname $0)/subunit.sh
+. $(dirname $0)/common_test_fns.inc
RELEASE="release-4-8-0-pre1"
release_dir="$SRCDIR_ABS/source4/selftest/provisions/$RELEASE"
@@ -23,103 +23,111 @@ old_release_dir="$SRCDIR_ABS/source4/selftest/provisions/$OLD_RELEASE"
samba_tdbrestore="tdbrestore"
if [ -x "$BINDIR/tdbrestore" ]; then
- samba_tdbrestore="$BINDIR/tdbrestore"
+ samba_tdbrestore="$BINDIR/tdbrestore"
fi
samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh"
if [ ! -x $samba_undump ] || [ ! -d $release_dir ] || [ ! -d $old_release_dir ]; then
- subunit_start_test $RELEASE
- subunit_skip_test $RELEASE <<EOF
+ subunit_start_test $RELEASE
+ subunit_skip_test $RELEASE <<EOF
no test provision
EOF
- subunit_start_test "functional_prep"
- subunit_skip_test "functional_prep" <<EOF
+ subunit_start_test "functional_prep"
+ subunit_skip_test "functional_prep" <<EOF
no test provision
EOF
- subunit_start_test "functional_prep_old"
- subunit_skip_test "functional_prep_old" <<EOF
+ subunit_start_test "functional_prep_old"
+ subunit_skip_test "functional_prep_old" <<EOF
no test provision
EOF
- exit 0
+ exit 0
fi
cleanup_output_directories()
{
- remove_directory $PREFIX_ABS/2012R2_schema
- remove_directory $PREFIX_ABS/$RELEASE
- remove_directory $PREFIX_ABS/$OLD_RELEASE
+ remove_directory $PREFIX_ABS/2012R2_schema
+ remove_directory $PREFIX_ABS/$RELEASE
+ remove_directory $PREFIX_ABS/$OLD_RELEASE
}
-undump() {
- $samba_undump $release_dir $PREFIX_ABS/$RELEASE $samba_tdbrestore
+undump()
+{
+ $samba_undump $release_dir $PREFIX_ABS/$RELEASE $samba_tdbrestore
}
-undump_old() {
- $samba_undump $old_release_dir $PREFIX_ABS/$OLD_RELEASE $samba_tdbrestore
+undump_old()
+{
+ $samba_undump $old_release_dir $PREFIX_ABS/$OLD_RELEASE $samba_tdbrestore
}
-
PROVISION_OPTS="--use-ntvfs --host-ip6=::1 --host-ip=127.0.0.1"
-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
+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
}
-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
+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
}
-ldapcmp() {
- # Our functional prep doesn't set these values as they were not provided
- # These are XML schema based enumerations which are used for claims
- ldapcmp_ignore "msDS-ClaimPossibleValues" "$RELEASE" "2012R2_schema"
+ldapcmp()
+{
+ # Our functional prep doesn't set these values as they were not provided
+ # These are XML schema based enumerations which are used for claims
+ ldapcmp_ignore "msDS-ClaimPossibleValues" "$RELEASE" "2012R2_schema"
}
-functional_prep() {
- $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/2012R2_schema/private/sam.ldb --function-level=2012_R2
+functional_prep()
+{
+ $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/2012R2_schema/private/sam.ldb --function-level=2012_R2
}
-functional_prep_old() {
- $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --function-level=2012_R2
+functional_prep_old()
+{
+ $PYTHON $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --function-level=2012_R2
}
-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
+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
}
-schema_upgrade() {
- $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --schema=2012_R2
+schema_upgrade()
+{
+ $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/$OLD_RELEASE/private/sam.ldb --schema=2012_R2
}
# double-check we cleaned up from the last test run
cleanup_output_directories
-testit $RELEASE undump || failed=`expr $failed + 1`
+testit $RELEASE undump || failed=$(expr $failed + 1)
# Provision a DC based on 2012R2 schema
-testit "provision_2012R2_schema" provision_2012r2 || 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" functional_prep || failed=$(expr $failed + 1)
# check that the databases are now the same
-testit "check_databases_same" ldapcmp || failed=`expr $failed + 1`
+testit "check_databases_same" ldapcmp || failed=$(expr $failed + 1)
-testit $OLD_RELEASE undump_old || failed=`expr $failed + 1`
+testit $OLD_RELEASE undump_old || failed=$(expr $failed + 1)
-testit "steal_roles" steal_roles || failed=`expr $failed + 1`
+testit "steal_roles" steal_roles || failed=$(expr $failed + 1)
-testit "schema_upgrade" schema_upgrade || failed=`expr $failed + 1`
+testit "schema_upgrade" schema_upgrade || failed=$(expr $failed + 1)
-testit "functional_prep_old" functional_prep_old || failed=`expr $failed + 1`
+testit "functional_prep_old" functional_prep_old || failed=$(expr $failed + 1)
cleanup_output_directories
diff --git a/testprogs/blackbox/join_ldapcmp.sh b/testprogs/blackbox/join_ldapcmp.sh
index e55a71007da..3e5b264e7d7 100755
--- a/testprogs/blackbox/join_ldapcmp.sh
+++ b/testprogs/blackbox/join_ldapcmp.sh
@@ -1,36 +1,39 @@
#!/bin/sh
# Does a join against the testenv's DC and then runs ldapcmp on the resulting DB
-. `dirname $0`/subunit.sh
+. $(dirname $0)/subunit.sh
TARGET_DIR="$PREFIX_ABS/join_$SERVER"
cleanup_output_dir()
{
- if [ -d $TARGET_DIR ]; then
- rm -fr $TARGET_DIR
- fi
+ if [ -d $TARGET_DIR ]; then
+ rm -fr $TARGET_DIR
+ fi
}
SAMBA_TOOL="$PYTHON $BINDIR/samba-tool"
-join_dc() {
- JOIN_ARGS="--targetdir=$TARGET_DIR --server=$SERVER -U$USERNAME%$PASSWORD"
- $SAMBA_TOOL domain join $REALM dc $JOIN_ARGS --option="netbios name = TESTJOINDC"
+join_dc()
+{
+ JOIN_ARGS="--targetdir=$TARGET_DIR --server=$SERVER -U$USERNAME%$PASSWORD"
+ $SAMBA_TOOL domain join $REALM dc $JOIN_ARGS --option="netbios name = TESTJOINDC"
}
-demote_joined_dc() {
- DEMOTE_ARGS="--remove-other-dead-server=TESTJOINDC --server=$SERVER -U$USERNAME%$PASSWORD"
- $SAMBA_TOOL domain demote $DEMOTE_ARGS
+demote_joined_dc()
+{
+ DEMOTE_ARGS="--remove-other-dead-server=TESTJOINDC --server=$SERVER -U$USERNAME%$PASSWORD"
+ $SAMBA_TOOL domain demote $DEMOTE_ARGS
}
-ldapcmp_result() {
- DB1_PATH="tdb://$PREFIX_ABS/$SERVER/private/sam.ldb"
- DB2_PATH="tdb://$TARGET_DIR/private/sam.ldb"
+ldapcmp_result()
+{
+ DB1_PATH="tdb://$PREFIX_ABS/$SERVER/private/sam.ldb"
+ DB2_PATH="tdb://$TARGET_DIR/private/sam.ldb"
- # interSiteTopologyGenerator gets periodically updated. With the restored
- # testenvs, it can sometimes point to the old/deleted DC object still
- $SAMBA_TOOL ldapcmp $DB1_PATH $DB2_PATH --filter=interSiteTopologyGenerator
+ # interSiteTopologyGenerator gets periodically updated. With the restored
+ # testenvs, it can sometimes point to the old/deleted DC object still
+ $SAMBA_TOOL ldapcmp $DB1_PATH $DB2_PATH --filter=interSiteTopologyGenerator
}
cleanup_output_dir
diff --git a/testprogs/blackbox/ldapcmp_restoredc.sh b/testprogs/blackbox/ldapcmp_restoredc.sh
index 90d57a568af..831b992e960 100755
--- a/testprogs/blackbox/ldapcmp_restoredc.sh
+++ b/testprogs/blackbox/ldapcmp_restoredc.sh
@@ -3,63 +3,65 @@
# was based on
if [ $# -lt 2 ]; then
-cat <<EOF
+ cat <<EOF
Usage: $0 ORIG_DC_PREFIX RESTORED_DC_PREFIX
EOF
-exit 1;
+ exit 1
fi
ORIG_DC_PREFIX_ABS="$1"
RESTORED_DC_PREFIX_ABS="$2"
shift 2
-. `dirname $0`/subunit.sh
+. $(dirname $0)/subunit.sh
-basedn() {
- SAMDB_PATH=$1
- $BINDIR/ldbsearch -H $SAMDB_PATH --basedn='' --scope=base defaultNamingContext | grep defaultNamingContext | awk '{print $2}'
+basedn()
+{
+ SAMDB_PATH=$1
+ $BINDIR/ldbsearch -H $SAMDB_PATH --basedn='' --scope=base defaultNamingContext | grep defaultNamingContext | awk '{print $2}'
}
-ldapcmp_with_orig() {
+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_ABS/private/sam.ldb"
+ DB2_PATH="tdb://$RESTORED_DC_PREFIX_ABS/private/sam.ldb"
- # check if the 2 DCs are in different domains
- DC1_BASEDN=$(basedn $DB1_PATH)
- DC2_BASEDN=$(basedn $DB2_PATH)
- BASE_DN_OPTS=""
+ # check if the 2 DCs are in different domains
+ DC1_BASEDN=$(basedn $DB1_PATH)
+ DC2_BASEDN=$(basedn $DB2_PATH)
+ BASE_DN_OPTS=""
- # if necessary, pass extra args to ldapcmp to handle the difference in base DNs
- if [ "$DC1_BASEDN" != "$DC2_BASEDN" ] ; then
- BASE_DN_OPTS="--base=$DC1_BASEDN --base2=$DC2_BASEDN"
- fi
+ # if necessary, pass extra args to ldapcmp to handle the difference in base DNs
+ if [ "$DC1_BASEDN" != "$DC2_BASEDN" ]; then
+ BASE_DN_OPTS="--base=$DC1_BASEDN --base2=$DC2_BASEDN"
+ fi
- # the restored DC will remove DNS entries for the old DC(s)
- IGNORE_ATTRS="dnsRecord,dNSTombstoned"
+ # the restored DC will remove DNS entries for the old DC(s)
+ IGNORE_ATTRS="dnsRecord,dNSTombstoned"
- # DC2 joined DC1, so it will have different DRS info
- IGNORE_ATTRS="$IGNORE_ATTRS,msDS-NC-Replica-Locations,msDS-HasInstantiatedNCs"
- IGNORE_ATTRS="$IGNORE_ATTRS,interSiteTopologyGenerator"
+ # DC2 joined DC1, so it will have different DRS info
+ IGNORE_ATTRS="$IGNORE_ATTRS,msDS-NC-Replica-Locations,msDS-HasInstantiatedNCs"
+ IGNORE_ATTRS="$IGNORE_ATTRS,interSiteTopologyGenerator"
- # there's a servicePrincipalName that uses the objectGUID of the DC's NTDS
- # Settings that will differ between the two DCs
- IGNORE_ATTRS="$IGNORE_ATTRS,servicePrincipalName"
+ # there's a servicePrincipalName that uses the objectGUID of the DC's NTDS
+ # Settings that will differ between the two DCs
+ IGNORE_ATTRS="$IGNORE_ATTRS,servicePrincipalName"
- # the restore changes the new DC's password twice
- IGNORE_ATTRS="$IGNORE_ATTRS,lastLogonTimestamp"
+ # the restore changes the new DC's password twice
+ IGNORE_ATTRS="$IGNORE_ATTRS,lastLogonTimestamp"
- # The RID pools get bumped during the restore process
- IGNORE_ATTRS="$IGNORE_ATTRS,rIDAllocationPool,rIDAvailablePool"
+ # The RID pools get bumped during the restore process
+ IGNORE_ATTRS="$IGNORE_ATTRS,rIDAllocationPool,rIDAvailablePool"
- # these are just differences between provisioning a domain and joining a DC
- IGNORE_ATTRS="$IGNORE_ATTRS,localPolicyFlags,operatingSystem,displayName"
+ # these are just differences between provisioning a domain and joining a DC
+ IGNORE_ATTRS="$IGNORE_ATTRS,localPolicyFlags,operatingSystem,displayName"
- # the restored DC may use a different side compared to the original DC
--
Samba Shared Repository
More information about the samba-cvs
mailing list