Commit 54517b9f authored by Howard Chu's avatar Howard Chu
Browse files

ITS#5117 use absolute FILE URLs 'cause BSD libfetch is braindead

parent dbac914e
...@@ -51,6 +51,7 @@ PROGDIR=./progs ...@@ -51,6 +51,7 @@ PROGDIR=./progs
DATADIR=${USER_DATADIR-./testdata} DATADIR=${USER_DATADIR-./testdata}
TESTDIR=${USER_TESTDIR-$TESTWD/testrun} TESTDIR=${USER_TESTDIR-$TESTWD/testrun}
SCHEMADIR=${USER_SCHEMADIR-./schema} SCHEMADIR=${USER_SCHEMADIR-./schema}
ABS_SCHEMADIR=`(cd $SCHEMADIR; pwd)`
DBDIR1A=$TESTDIR/db.1.a DBDIR1A=$TESTDIR/db.1.a
DBDIR1B=$TESTDIR/db.1.b DBDIR1B=$TESTDIR/db.1.b
......
...@@ -187,15 +187,15 @@ fi ...@@ -187,15 +187,15 @@ fi
echo "Adding schema and databases on producer..." echo "Adding schema and databases on producer..."
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1 $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
include: file:$SCHEMADIR/core.ldif include: file://$ABS_SCHEMADIR/core.ldif
include: file:$SCHEMADIR/cosine.ldif include: file://$ABS_SCHEMADIR/cosine.ldif
include: file:$SCHEMADIR/inetorgperson.ldif include: file://$ABS_SCHEMADIR/inetorgperson.ldif
include: file:$SCHEMADIR/openldap.ldif include: file://$ABS_SCHEMADIR/openldap.ldif
include: file:$SCHEMADIR/nis.ldif include: file://$ABS_SCHEMADIR/nis.ldif
EOF EOF
RC=$? RC=$?
if test $RC != 0 ; then if test $RC != 0 ; then
......
...@@ -204,15 +204,15 @@ EOF ...@@ -204,15 +204,15 @@ EOF
echo "Adding schema and databases on producer..." echo "Adding schema and databases on producer..."
$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1 $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
include: file:$SCHEMADIR/core.ldif include: file://$ABS_SCHEMADIR/core.ldif
include: file:$SCHEMADIR/cosine.ldif include: file://$ABS_SCHEMADIR/cosine.ldif
include: file:$SCHEMADIR/inetorgperson.ldif include: file://$ABS_SCHEMADIR/inetorgperson.ldif
include: file:$SCHEMADIR/openldap.ldif include: file://$ABS_SCHEMADIR/openldap.ldif
include: file:$SCHEMADIR/nis.ldif include: file://$ABS_SCHEMADIR/nis.ldif
EOF EOF
RC=$? RC=$?
if test $RC != 0 ; then if test $RC != 0 ; then
......
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