summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/dsdb/samdb/ldb_modules/extended_dn_in.c2
-rwxr-xr-xsource4/selftest/tests.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
index 78f0426ce9..c1afbea177 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_in.c
@@ -358,7 +358,7 @@ static int extended_dn_in_fix(struct ldb_module *module, struct ldb_request *req
base_dn_scope,
base_dn_filter,
base_dn_attrs,
- NULL,
+ req->controls,
ac, extended_base_callback,
req);
LDB_REQ_SET_LOCATION(down_req);
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 7af37883ee..8918dc200d 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -146,7 +146,7 @@ echo "OPTIONS $TORTURE_OPTIONS"
# Simple tests for LDAP and CLDAP
-for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD" "-U\$USERNAME%\$PASSWORD -k yes" "-U\$USERNAME%\$PASSWORD -k no" "-U\$USERNAME%\$PASSWORD -k no --sign" "-U\$USERNAME%\$PASSWORD -k no --encrypt" "-U\$USERNAME%\$PASSWORD -k yes --encrypt" "-U\$USERNAME%\$PASSWORD -k yes --sign"; do
+for options in "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD" "-U\$USERNAME%\$PASSWORD -k yes" "-U\$USERNAME%\$PASSWORD -k no" "-U\$USERNAME%\$PASSWORD -k no --sign" "-U\$USERNAME%\$PASSWORD -k no --encrypt" "-U\$USERNAME%\$PASSWORD -k yes --encrypt" "-U\$USERNAME%\$PASSWORD -k yes --sign"; do
plantestsuite "samba4.ldb.ldap with options $options (dc)" dc $bbdir/test_ldb.sh ldap \$SERVER $options
done
# see if we support ldaps
@@ -154,11 +154,11 @@ done
CONFIG_H="$samba4bindir/default/source4/include/config.h"
}
if grep ENABLE_GNUTLS.1 $CONFIG_H > /dev/null; then
- for options in "" "-U\$USERNAME%\$PASSWORD"; do
+ for options in "-U\$USERNAME%\$PASSWORD"; do
plantestsuite "samba4.ldb.ldaps with options $options (dc)" dc $bbdir/test_ldb.sh ldaps \$SERVER_IP $options
done
fi
-for options in "" "-U\$USERNAME%\$PASSWORD"; do
+for options in "-U\$USERNAME%\$PASSWORD"; do
plantestsuite "samba4.ldb.ldapi with options $options (dc:local)" dc:local $bbdir/test_ldb.sh ldapi \$PREFIX_ABS/dc/private/ldapi $options
done
for t in `$smb4torture --list | grep "^LDAP-"`