diff options
| author | Joe Guo <joeg@catalyst.net.nz> | 2018-10-29 17:45:28 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-11-21 07:46:19 +0100 |
| commit | 2851cd5bccde53a049bbd3774911b7dc4b970467 (patch) | |
| tree | da610efc889c5b3997034ce2608f91ec4e0746cb /testprogs | |
| parent | bbd082e7929010545deb5ce59e370ebe934aa23e (diff) | |
| download | samba-2851cd5bccde53a049bbd3774911b7dc4b970467.tar.gz | |
netcmd/ldapcmp: pass --skip-missing-dn to LDAPBase
This option has default value False, and was actually not passed down from cli
to LDAPBase. However, LDAPBase.__init__ has default value True for it.
After the change, a few tests using ldapcmp are affected.
Add --skip-missing-dn explicitly to keep the behavior consistent,
otherwise test will fail.
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/functionalprep.sh | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/ldapcmp_restoredc.sh | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/schemaupgrade.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/testprogs/blackbox/functionalprep.sh b/testprogs/blackbox/functionalprep.sh index 8a5eafb0966..80e82252d45 100755 --- a/testprogs/blackbox/functionalprep.sh +++ b/testprogs/blackbox/functionalprep.sh @@ -61,7 +61,7 @@ provision_2012r2() { 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 + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/$2/private/sam.ldb tdb://$PREFIX_ABS/$3/private/sam.ldb --two --skip-missing-dn } ldapcmp() { diff --git a/testprogs/blackbox/ldapcmp_restoredc.sh b/testprogs/blackbox/ldapcmp_restoredc.sh index d7a51aebbf2..82804b218ca 100755 --- a/testprogs/blackbox/ldapcmp_restoredc.sh +++ b/testprogs/blackbox/ldapcmp_restoredc.sh @@ -59,7 +59,7 @@ ldapcmp_with_orig() { IGNORE_ATTRS="$IGNORE_ATTRS,serverReferenceBL,msDS-IsDomainFor" LDAPCMP_CMD="$PYTHON $BINDIR/samba-tool ldapcmp" - $LDAPCMP_CMD $DB1_PATH $DB2_PATH --two --filter=$IGNORE_ATTRS $BASE_DN_OPTS + $LDAPCMP_CMD $DB1_PATH $DB2_PATH --two --skip-missing-dn --filter=$IGNORE_ATTRS $BASE_DN_OPTS } # check that the restored testenv DC basically matches the original diff --git a/testprogs/blackbox/schemaupgrade.sh b/testprogs/blackbox/schemaupgrade.sh index d04a8212454..19b71e5810e 100755 --- a/testprogs/blackbox/schemaupgrade.sh +++ b/testprogs/blackbox/schemaupgrade.sh @@ -50,7 +50,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 + $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 } ldapcmp_old() { |