Commit 87d5d6a9 authored by Hallvard Furuseth's avatar Hallvard Furuseth
Browse files

Support back-null

parent 182e2314
......@@ -37,6 +37,7 @@ database @BACKEND@
suffix "dc=example,dc=com"
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
......
......@@ -45,6 +45,7 @@ database @BACKEND@
suffix "dc=example,dc=com"
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
......
......@@ -40,6 +40,7 @@ database @BACKEND@
suffix "dc=example,dc=com"
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
......
......@@ -29,6 +29,7 @@ AC_hdb=@BUILD_HDB@
AC_ldap=ldap@BUILD_LDAP@
AC_meta=meta@BUILD_META@
AC_monitor=@BUILD_MONITOR@
AC_null=null@BUILD_NULL@
AC_relay=relay@BUILD_RELAY@
AC_sql=sql@BUILD_SQL@
......@@ -63,7 +64,7 @@ if test "${AC_meta}" = "metamod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
AC_meta="metano"
fi
export AC_bdb AC_hdb AC_ldap AC_meta AC_monitor AC_relay AC_sql \
export AC_bdb AC_hdb AC_ldap AC_meta AC_monitor AC_null AC_relay AC_sql \
AC_accesslog AC_dds AC_dynlist AC_memberof AC_pcache AC_ppolicy \
AC_refint AC_retcode AC_rwm AC_unique AC_syncprov AC_translucent \
AC_valsort \
......
......@@ -40,6 +40,7 @@ sed -e "s/@BACKEND@/${BACKEND}/" \
-e "s/^#${BACKENDTYPE}#//" \
-e "s/^#${AC_ldap}#//" \
-e "s/^#${AC_meta}#//" \
-e "s/^#${AC_null}#//" \
-e "s/^#${AC_relay}#//" \
-e "s/^#${AC_sql}#//" \
-e "s/^#${RDBMS}#//" \
......
......@@ -13,11 +13,6 @@
## top-level directory of the distribution or, alternatively, at
## <http://www.OpenLDAP.org/license.html>.
if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" && test "$BACKEND" != "ldif"; then
echo "Test does not support $BACKEND"
exit 0
fi
echo "running defines.sh"
. $SRCDIR/scripts/defines.sh
......
......@@ -21,10 +21,8 @@ if test $UNIQUE = uniqueno; then
exit 0
fi
if test $BACKEND = null; then
echo "Test does not support $BACKEND backend, test skipped"
exit 0
fi
RCODEconstraint=19
test $BACKEND = null && RCODEconstraint=0
mkdir -p $TESTDIR $DBDIR1
......@@ -112,7 +110,7 @@ employeeType: contractor
givenName: Bill
EOTUNIQ2
RC=$?
if test $RC != 19 ; then
if test $RC != $RCODEconstraint ; then
echo "unique check failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit -1
......@@ -228,7 +226,7 @@ employeeType: contractor
givenName: Bill
EOTUNIQ2
RC=$?
if test $RC != 19 ; then
if test $RC != $RCODEconstraint ; then
echo "unique check failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit -1
......@@ -285,7 +283,7 @@ employeeType: contractor
givenName: Bill
EOTUNIQ2
RC=$?
if test $RC != 19 ; then
if test $RC != $RCODEconstraint ; then
echo "olcUniqueAttribtue single deletion hit the wrong value"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit -1
......@@ -345,7 +343,7 @@ employeeType: contractor
givenName: Bill
EOTUNIQ2
RC=$?
if test $RC != 19 ; then
if test $RC != $RCODEconstraint ; then
echo "unique check failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit -1
......@@ -510,7 +508,7 @@ cn: elvis
EOF
RC=$?
if test $RC != 19 ; then
if test $RC != $RCODEconstraint ; then
echo "unique check failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit -1
......@@ -582,7 +580,7 @@ description: left the building
EOF
RC=$?
if test $RC != 19 ; then
if test $RC != $RCODEconstraint ; then
echo "unique check failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit -1
......
......@@ -74,9 +74,11 @@ case $RC in
echo "ldapmodify failed as expected"
;;
0)
echo "ldapmodify should have failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit -1
if test $BACKEND != null ; then
echo "ldapmodify should have failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit -1
fi
;;
*)
echo "ldapmodify failed ($RC)!"
......
Markdown is supported
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