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

This commit is contained in:
Pierangelo Masarati 2005-05-23 07:26:19 +00:00
parent fc148e8e54
commit eee9efbd1e
7 changed files with 14 additions and 39 deletions

View File

@ -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"

View File

@ -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@

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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=