Commit ad4734a1 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5810

parent fedbb4fb
......@@ -41,6 +41,8 @@ OpenLDAP 2.4.22 Engineering
Fixed slapo-valsort REP_ENTRY flag handling (ITS#5340,ITS#6423)
Fixed contrib/sha2 adds mechs for more hashes (ITS#6433)
Fixed contrib/nssov to use nss-pam-ldapd (ITS#6488)
Build Environment
Added back-ldif, back-null test support (ITS#5810)
Documentation
admin24 avoid explicity moduleload statements (ITS#6486)
admin24 broken link fixes (ITS#6493,ITS#6515)
......
......@@ -53,6 +53,10 @@ sql-yes sql-mod: FORCE
@echo "Initiating LDAP tests for SQL..."
@$(RUN) -b sql sql-all
ldif test-ldif: FORCE
@echo "Initiating LDAP tests for LDIF..."
@$(RUN) -b ldif all
regressions: FORCE
@echo "Testing (available) ITS regressions"
@$(RUN) its-all
......
......@@ -38,7 +38,7 @@ database @BACKEND@
suffix "ou=Special,dc=example,dc=com"
subordinate
rootdn "cn=Manager,dc=example,dc=com"
directory @TESTDIR@/db.2.a
#~null~#directory @TESTDIR@/db.2.a
# Indices to maintain
#bdb#index default pres,eq
......@@ -52,7 +52,8 @@ database @BACKEND@
suffix "dc=example,dc=com"
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
directory @TESTDIR@/db.1.a
#null#bind on
#~null~#directory @TESTDIR@/db.1.a
# Indices to maintain
#bdb#index default pres,eq
......
......@@ -3,97 +3,127 @@ dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig
olcDatabase: {-1}frontend
olcAddContentAcl: FALSE
olcLastMod: TRUE
olcMaxDerefDepth: 0
olcReadOnly: FALSE
olcSchemaDN: cn=Subschema
olcSyncUseSubentry: FALSE
olcMonitoring: FALSE
dn: olcDatabase={0}config,cn=config
objectClass: olcDatabaseConfig
olcDatabase: {0}config
olcAccess: {0}to * by * none
olcAddContentAcl: TRUE
olcLastMod: TRUE
olcMaxDerefDepth: 15
olcReadOnly: FALSE
olcRootDN: cn=config
olcRootPW: config
olcSyncUseSubentry: FALSE
olcMonitoring: FALSE
dn: olcDatabase={1}monitor,cn=config
objectClass: olcDatabaseConfig
olcDatabase: {1}monitor
olcAddContentAcl: FALSE
olcLastMod: TRUE
olcMaxDerefDepth: 15
olcReadOnly: FALSE
olcSyncUseSubentry: FALSE
olcMonitoring: FALSE
# Searching databases __after__ append...
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig
olcDatabase: {-1}frontend
olcAddContentAcl: FALSE
olcLastMod: TRUE
olcMaxDerefDepth: 0
olcReadOnly: FALSE
olcSchemaDN: cn=Subschema
olcSyncUseSubentry: FALSE
olcMonitoring: FALSE
dn: olcDatabase={0}config,cn=config
objectClass: olcDatabaseConfig
olcDatabase: {0}config
olcAccess: {0}to * by * none
olcAddContentAcl: TRUE
olcLastMod: TRUE
olcMaxDerefDepth: 15
olcReadOnly: FALSE
olcRootDN: cn=config
olcRootPW: config
olcSyncUseSubentry: FALSE
olcMonitoring: FALSE
dn: olcDatabase={1}monitor,cn=config
objectClass: olcDatabaseConfig
olcDatabase: {1}monitor
olcAddContentAcl: FALSE
olcLastMod: TRUE
olcMaxDerefDepth: 15
olcReadOnly: FALSE
olcSyncUseSubentry: FALSE
olcMonitoring: FALSE
dn: olcDatabase={2}bdb,cn=config
objectClass: olcDatabaseConfig
objectClass: olcBdbConfig
olcDatabase: {2}bdb
olcSuffix: dc=com
olcDbDirectory: ./testrun/db.1.a
olcSuffix: dc=com
# Searching databases __after__ insert...
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig
olcDatabase: {-1}frontend
olcAddContentAcl: FALSE
olcLastMod: TRUE
olcMaxDerefDepth: 0
olcReadOnly: FALSE
olcSchemaDN: cn=Subschema
olcSyncUseSubentry: FALSE
olcMonitoring: FALSE
dn: olcDatabase={0}config,cn=config
objectClass: olcDatabaseConfig
olcDatabase: {0}config
olcAccess: {0}to * by * none
olcAddContentAcl: TRUE
olcLastMod: TRUE
olcMaxDerefDepth: 15
olcReadOnly: FALSE
olcRootDN: cn=config
olcRootPW: config
olcSyncUseSubentry: FALSE
olcMonitoring: FALSE
dn: olcDatabase={1}bdb,cn=config
objectClass: olcDatabaseConfig
objectClass: olcBdbConfig
olcDatabase: {1}bdb
olcSuffix: dc=org
olcDbDirectory: ./testrun/db.2.a
olcSuffix: dc=org
dn: olcDatabase={2}monitor,cn=config
objectClass: olcDatabaseConfig
olcDatabase: {2}monitor
olcAddContentAcl: FALSE
olcLastMod: TRUE
olcMaxDerefDepth: 15
olcReadOnly: FALSE
olcSyncUseSubentry: FALSE
olcMonitoring: FALSE
dn: olcDatabase={3}bdb,cn=config
objectClass: olcDatabaseConfig
objectClass: olcBdbConfig
olcDatabase: {3}bdb
olcSuffix: dc=com
olcDbDirectory: ./testrun/db.1.a
olcSuffix: dc=com
......@@ -139,9 +139,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
LDIF=$ITSDIR/config.out
echo "Filtering ldapsearch results..."
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Filtering original ldif..."
. $LDIFFILTER < $LDIF > $LDIFFLT
$LDIFFILTER < $LDIF > $LDIFFLT
echo "Comparing filter output..."
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
......
......@@ -308,9 +308,9 @@ if test $RC != 0 ; then
fi
echo "Filtering ldapsearch results..."
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Filtering original ldif used to create database..."
. $LDIFFILTER < $METACONCURRENCYOUT > $LDIFFLT
$LDIFFILTER < $METACONCURRENCYOUT > $LDIFFLT
echo "Comparing filter output..."
$BCMP $SEARCHFLT $LDIFFLT > $CMPOUT
......
......@@ -32,8 +32,8 @@ argsfile @TESTDIR@/slapd.1.args
database @BACKEND@
suffix "cn=Everyone,ou=Groups,dc=example,dc=com"
directory @TESTDIR@/db.1.a
subordinate
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......@@ -43,9 +43,9 @@ subordinate
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.b
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.b
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -43,9 +43,9 @@ access to dn="cn=Subschema"
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -43,9 +43,9 @@ access to *
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -33,9 +33,9 @@ argsfile @TESTDIR@/slapd.1.args
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -51,9 +51,10 @@ chain-idassert-bind bindmethod=simple
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#null#bind on
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -40,9 +40,9 @@ argsfile @TESTDIR@/slapd.2.args
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.2.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.2.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -38,9 +38,9 @@ moduleload @DATADIR@/comp_libs/compmatch.la
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#hdb#index objectClass eq
#ndb#dbname db_1
......
......@@ -7,9 +7,9 @@ include @SCHEMADIR@/core.schema
database @BACKEND@
suffix "o=undo"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,o=undo"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -37,9 +37,9 @@ argsfile @TESTDIR@/slapd.1.args
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#bdb#index entryExpireTimestamp eq
......
......@@ -37,8 +37,8 @@ argsfile @TESTDIR@/slapd.1.args
database @BACKEND@
suffix "cn=log"
directory @TESTDIR@/db.1.b
rootdn "cn=Manager,dc=example,dc=com"
#~null~#directory @TESTDIR@/db.1.b
#bdb#index objectClass eq
#bdb#index entryUUID,entryCSN eq
#hdb#index objectClass eq
......@@ -53,9 +53,9 @@ syncprov-nopresent true
rootdn "cn=Manager,dc=example,dc=com"
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#bdb#index entryUUID,entryCSN eq
......
......@@ -44,9 +44,10 @@ argsfile @TESTDIR@/slapd.2.args
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.2.a
rootdn "cn=Replica,dc=example,dc=com"
rootpw secret
#null#bind on
#~null~#directory @TESTDIR@/db.2.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -35,9 +35,9 @@ argsfile @TESTDIR@/slapd.1.args
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -40,9 +40,9 @@ argsfile @TESTDIR@/slapd.1.args
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
......@@ -40,9 +40,9 @@ access to dn.exact="cn=Subschema"
database @BACKEND@
suffix "dc=example,dc=com"
directory @TESTDIR@/db.1.a
rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#~null~#directory @TESTDIR@/db.1.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......@@ -65,9 +65,9 @@ access to dn.subtree="dc=example,dc=com"
database @BACKEND@
suffix ""
directory @TESTDIR@/db.2.a
rootdn "cn=Manager,c=US"
rootpw secret
#~null~#directory @TESTDIR@/db.2.a
#bdb#index objectClass eq
#bdb#index cn,sn,uid pres,eq,sub
#hdb#index objectClass eq
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment