rework according to table-driven, back-config enabled back-ldap and related overlays

diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf
index 648ac31320dd738c330998724b9fbdd54ff8f9aa..6ade32efd89543051f144cb4000d7bd0fb4dffbb 100644 (file)
--- a/tests/data/slapd-idassert.conf
+++ b/tests/data/slapd-idassert.conf
@@ -84,11 +84,8 @@ database     ldap
 suffix         "o=Example,c=US"
 uri            "@URI1@"
 
-#sasl#idassert-method "sasl" "authcDN=cn=Proxy US,ou=Admin,dc=example,dc=com" "authcID=admin/proxy US" "cred=proxy" @SASL_MECH@
-#nosasl#idassert-method "simple"
-#nosasl#idassert-authcDN       "cn=Proxy US,ou=Admin,dc=example,dc=com"
-#nosasl#idassert-passwd                proxy
-idassert-mode  self
+#sasl#idassert-bind    bindmethod=sasl binddn="cn=Proxy US,ou=Admin,dc=example,dc=com" authcId="admin/proxy US" credentials="proxy" @SASL_MECH@ mode=self
+#nosasl#idassert-bind  bindmethod=simple binddn="cn=Proxy US,ou=Admin,dc=example,dc=com" credentials="proxy" mode=self
 
 # authorizes database
 idassert-authzFrom     "dn.subtree:dc=example,dc=it"
@@ -103,10 +100,7 @@ uri                "@URI1@"
 acl-authcDN    "cn=Proxy IT,ou=Admin,dc=example,dc=com"
 acl-passwd     proxy
 
-idassert-method "simple"
-idassert-authcDN       "cn=Proxy IT,ou=Admin,dc=example,dc=com"
-idassert-passwd                proxy
-idassert-mode  "dn:cn=Sandbox,ou=Admin,dc=example,dc=com"
+idassert-bind  bindmethod=simple binddn="cn=Proxy IT,ou=Admin,dc=example,dc=com" credentials="proxy" authzId="dn:cn=Sandbox,ou=Admin,dc=example,dc=com"
 
 # authorizes database
 idassert-authzFrom     "dn.subtree:dc=example,dc=com"

diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf
index 95e9e286048ace4bd9b6938a647e0aef10cc7ddf..a07599d676d09dd2675512838332e8800540d56d 100644 (file)
--- a/tests/data/slapd-ldapglue.conf
+++ b/tests/data/slapd-ldapglue.conf
@@ -54,22 +54,16 @@ database        ldap
 suffix          "ou=People,dc=example,dc=com"
 uri             "@URI2@"
 # FIXME: doesn't work with authz=native
-#sasl#idassert-method  sasl authcid=proxy cred=proxy @SASL_MECH@
-#nosasl#idassert-method  simple
-#nosasl#idassert-authcDN "uid=proxy,ou=People,dc=example,dc=com"
-#nosasl#idassert-passwd  proxy
-idassert-mode   self
+#sasl#idassert-bind    bindmethod=sasl authcid=proxy credentials=proxy @SASL_MECH@ mode=self
+#nosasl#idassert-bind  bindmethod=simple binddn"uid=proxy,ou=People,dc=example,dc=com" credentials=proxy mode=self
 
 # groups branch
 database        ldap
 suffix          "ou=Groups,dc=example,dc=com"
 uri             "@URI3@"
 # FIXME: doesn't work with authz=native
-#sasl#idassert-method  sasl authcid=proxy cred=proxy @SASL_MECH@
-#nosasl#idassert-method  simple
-#nosasl#idassert-authcDN "uid=proxy,ou=Groups,dc=example,dc=com"
-#nosasl#idassert-passwd  proxy
-idassert-mode    self
+#sasl#idassert-bind    bindmethod=sasl authcid=proxy credentials=proxy @SASL_MECH@ mode=self
+#nosasl#idassert-bind  bindmethod=simple binddn="uid=proxy,ou=Groups,dc=example,dc=com" credentials=proxy mode=self
 
 # root
 database        @BACKEND@

diff --git a/tests/data/slapd-meta.conf b/tests/data/slapd-meta.conf
index e1014af1c8d4c97d60191b6c2c9e81e306d175d7..1eefd7cbd4ad2b85e4d41f1304595c2a2f2d8f95 100644 (file)
--- a/tests/data/slapd-meta.conf
+++ b/tests/data/slapd-meta.conf
@@ -45,7 +45,7 @@ rootdn                "cn=Manager,o=Example,c=US"
 rootpw         secret
 chase-referrals        no
 #nretries      forever
-nretries       1000
+#nretries      1000
 
 # local
 uri            "@URI2@ou=Meta,o=Example,c=US"

diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index a03323286772125a370c0c0545120254f378df9b..2de1bf49f2f9eb3cd49cb5b32e4201c07c2cf240 100644 (file)
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -32,16 +32,10 @@ argsfile    ./testrun/slapd.2.args
 
 #ldapyes#overlay               chain
 #ldapyes#chain-uri             @URI1@
-#ldapyes#chain-idassert-method "simple"
-#ldapyes#chain-idassert-authcDN        "cn=Manager,dc=example,dc=com"
-#ldapyes#chain-idassert-passwd secret
-#ldapyes#chain-idassert-mode   self
+#ldapyes#chain-idassert-bind   bindmethod=simple binddn="cn=Manager,dc=example,dc=com" credentials=secret mode=self
 #ldapmod#overlay               chain
 #ldapmod#chain-uri             @URI1@
-#ldapmod#chain-idassert-method "simple"
-#ldapmod#chain-idassert-authcDN        "cn=Manager,dc=example,dc=com"
-#ldapmod#chain-idassert-passwd secret
-#ldapmod#chain-idassert-mode   self
+#ldapmod#chain-idassert-bind   bindmethod=simple binddn="cn=Manager,dc=example,dc=com" credentials=secret mode=self
 
 #######################################################################
 # database definitions

diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index 75520f92684a2e679e01dfbd461488292857a20b..c930f3c1c9ec067724fe5600c96e40158c00402e 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -34,16 +34,10 @@ argsfile    ./testrun/slapd.4.args
 
 #ldapyes#overlay               chain
 #ldapyes#chain-uri             @URI1@
-#ldapyes#chain-idassert-method "simple"
-#ldapyes#chain-idassert-authcDN        "cn=Manager,dc=example,dc=com"
-#ldapyes#chain-idassert-passwd secret
-#ldapyes#chain-idassert-mode   self
+#ldapyes#chain-idassert-bind   bindmethod=simple binddn="cn=Manager,dc=example,dc=com" credentials=secret mode=self
 #ldapmod#overlay               chain
 #ldapmod#chain-uri             @URI1@
-#ldapmod#chain-idassert-method "simple"
-#ldapmod#chain-idassert-authcDN        "cn=Manager,dc=example,dc=com"
-#ldapmod#chain-idassert-passwd secret
-#ldapmod#chain-idassert-mode   self
+#ldapmod#chain-idassert-bind   bindmethod=simple binddn="cn=Manager,dc=example,dc=com" credentials=secret mode=self
 
 #######################################################################
 # consumer database definitions

diff --git a/tests/data/slapd-translucent-local.conf b/tests/data/slapd-translucent-local.conf
index 3f4ed66066d75156a27cc8c1b6621100f7176e8b..3ba45516a76b5036f894f25c0bc5ebe4368c03fc 100644 (file)
--- a/tests/data/slapd-translucent-local.conf
+++ b/tests/data/slapd-translucent-local.conf
@@ -51,5 +51,4 @@ translucent_no_glue
 # XXX this uri really shouldn't be hardcoded
 uri            @URI1@
 lastmod                off
-acl-authcDN            uid=binder,o=translucent
-acl-passwd             bindtest
+acl-bind       binddn="uid=binder,o=translucent" credentials="bindtest"

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 5ba3b9d9126f1b93663752ce811db1d5fb429cbe..06cbe3120594bb894b4d40906c1a73b4226622ed 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -27,7 +27,7 @@ if [ x"$WITH_SASL" = x"yes" -a x"$USE_SASL" != x"no" ] ; then
        if [ x"$USE_SASL" = x"yes" ] ; then
                USE_SASL=DIGEST-MD5
        fi
-       SASL_MECH="\"mech=$USE_SASL\""
+       SASL_MECH="\"saslmech=$USE_SASL\""
 else
        SASL="nosasl"
        SASL_MECH=