diff options
author | Andrew Bartlett <abartlet@samba.org> | 2017-01-12 16:51:45 +1300 |
---|---|---|
committer | Douglas Bagnall <dbagnall@samba.org> | 2017-02-09 03:17:16 +0100 |
commit | 8368e06ff65cc70e1cf13a0eb4349033e068fcc6 (patch) | |
tree | b77de59163c35a71e52648092b4b04fabd8d554b /source4/setup | |
parent | 538bbd5e9c492f606215ae55e44aa4bdc22f8a9f (diff) | |
download | samba-8368e06ff65cc70e1cf13a0eb4349033e068fcc6.tar.gz |
samba_dsdb: Use and maintain compatibleFeatures and requiredFeatures in @SAMBA_DSDB
This will allow us to introduce new database features that are
backward compatible from the point of view of older versions of Samba,
but which will be damaged by modifying the database with such a
version.
For example, if linked attributes are stored in sorted order in 4.7,
and this change, without any values in current_supportedFeatures is
itself included in 4.6, then our sortedLinks are backward compatible
to that release.
That is with 4.6 (including this patch) which doesn't care about
ordering -- but a downgraded 4.7 database used by 4.6 will be broken
when later used with 4.7. If we add a 'sortedLinks' feature flag in
compatibleFeatures, we can detect that.
This will allow us to determine if the database still contains
unsorted links, as that information allows us to make the code
handling links much more efficient.
We won't add the actual flag until all the code is in place.
Andrew wrote the actual code and Douglas wrote the tests, and they
cross-reviewed.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Piar-programmed-with: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
selftest: check for database features flags
Diffstat (limited to 'source4/setup')
-rwxr-xr-x | source4/setup/tests/blackbox_supported_features.sh | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/source4/setup/tests/blackbox_supported_features.sh b/source4/setup/tests/blackbox_supported_features.sh new file mode 100755 index 00000000000..640338ebf84 --- /dev/null +++ b/source4/setup/tests/blackbox_supported_features.sh @@ -0,0 +1,86 @@ +#!/bin/sh + +if [ $# -lt 1 ]; then +cat <<EOF +Usage: blackbox_supported_features.sh PREFIX +EOF +exit 1; +fi + +PREFIX="$1" +shift 1 + +DBPATH=$PREFIX/supported-features + +. `dirname $0`/../../../testprogs/blackbox/subunit.sh + +ldbmodify="ldbmodify" +if [ -x "$BINDIR/ldbmodify" ]; then + ldbmodify="$BINDIR/ldbmodify" +fi + +ldbdel="ldbdel" +if [ -x "$BINDIR/ldbdel" ]; then + ldbdel="$BINDIR/ldbdel" +fi + +ldbsearch="ldbsearch" +if [ -x "$BINDIR/ldbsearch" ]; then + ldbsearch="$BINDIR/ldbsearch" +fi + +testit "provision" $PYTHON $BINDIR/samba-tool domain provision \ + --domain=FOO --realm=foo.example.com \ + --targetdir=$DBPATH --use-ntvfs + +testit "add-compatible-feature" $ldbmodify \ + -H tdb://$DBPATH/private/sam.ldb <<EOF +dn: @SAMBA_DSDB +changetype: modify +add: compatibleFeatures +compatibleFeatures: non-existent-feature +- + +EOF + +# The non-existent feature is not compatible with this version, so it +# should not be listed in compatibleFeatures even though we tried to +# put it there. + +ldb_search_fail() { + $ldbsearch -H tdb://$DBPATH/private/sam.ldb \ + -s base -b "$1" "$2" \ + | grep -q "$3" +} + + +testit_expect_failure "find-compatible-feature" \ + ldb_search_fail '@SAMBA_DSDB' 'compatibleFeatures' non-existent-feature + + +# just make sure the thing we're using is normally findable +testit "find-test-feature" \ + $ldbsearch -H tdb://$DBPATH/private/sam.ldb \ + -b 'CN=LostAndFound,DC=foo,DC=example,DC=com' + + +testit "add-required-feature" $ldbmodify \ + -H tdb://$DBPATH/private/sam.ldb <<EOF +dn: @SAMBA_DSDB +changetype: modify +add: requiredFeatures +requiredFeatures: futuristic-feature +- + +EOF + +# The futuristic-feature is not implemented in this version, but it is +# required by this database. A search for anything should fail. + +testit_expect_failure "find-required-feature" \ + $ldbsearch -H tdb://$DBPATH/private/sam.ldb \ + -b 'CN=LostAndFound,DC=foo,DC=example,DC=com' + +rm -rf $DBPATH + +exit $failed |