Commit af4571df authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Filter results before compare to eliminate modifytime errors.

parent accc1724
#!/bin/sh
grep -v "modifiersname" | \
grep -v "modifytimestamp" | \
grep -v "creatorsname" | \
grep -v "createtimestamp"
......@@ -20,7 +20,11 @@ PASSWD=secret
BABSDN="cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US"
BJORNSDN="cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US"
JAJDN="cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US"
MASTERLOG=$DBDIR/master.log
SLAVELOG=$DBDIR/slave.log
SEARCHOUT=$DBDIR/ldapsearch.out
SEARCHFLT=$DBDIR/ldapsearch.flt
LDIFFLT=$DBDIR/ldif.flt
MASTEROUT=$DBDIR/master.out
SLAVEOUT=$DBDIR/slave.out
TESTOUT=$DBDIR/ldapsearch.out
......
......@@ -5,10 +5,10 @@
echo "Cleaning up in $DBDIR..."
rm -f $DBDIR/*
rm -f $DBDIR/[^C]*
echo "Starting slapd on TCP/IP port $PORT..."
$SLAPD -f $CONF -p $PORT -d 1 > /dev/null 2>&1 &
$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
PID=$!
echo "Using ldapsearch to check that slapd is running..."
......@@ -44,8 +44,10 @@ if [ $RC != 0 ]; then
exit $RC
fi
. scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
. scripts/acfilter.sh < $LDIF > $LDIFFLT
echo "Comparing retrieved entries to LDIF file used to create database"
cmp $SEARCHOUT $LDIF
cmp $SEARCHFLT $LDIFFLT
if [ $? != 0 ]; then
echo "comparison failed - database was not created correctly"
exit 1
......
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