mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-27 10:09:43 -05:00
For ITS#5810: Use progs/ldif-filter. Retire scripts/acfilter.sh.
This commit is contained in:
parent
725743abdb
commit
0f86c2e8eb
56 changed files with 166 additions and 188 deletions
|
|
@ -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..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
#! /bin/sh
|
||||
# $OpenLDAP$
|
||||
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||
##
|
||||
## Copyright 1998-2009 The OpenLDAP Foundation.
|
||||
## All rights reserved.
|
||||
##
|
||||
## Redistribution and use in source and binary forms, with or without
|
||||
## modification, are permitted only as authorized by the OpenLDAP
|
||||
## Public License.
|
||||
##
|
||||
## A copy of this license is available in the file LICENSE in the
|
||||
## top-level directory of the distribution or, alternatively, at
|
||||
## <http://www.OpenLDAP.org/license.html>.
|
||||
#
|
||||
# Strip comments, sort attributes. Requires GNU awk
|
||||
#
|
||||
if [ "$BACKEND" != ndb ]; then
|
||||
grep -v '^#'
|
||||
else
|
||||
grep -v '^#'| awk 'BEGIN{FS="\n";RS=""} {j=0; for (i=1; i<=NF; i++){ if ($i ~ /^ /){ x[j] = x[j] "\n" $i; } else { j++; x[j] = $i } } print x[1]; delete x[1]; j=asort(x); for (i=1; i<=j; i++){ print x[i]; } delete x; print "" }'
|
||||
fi
|
||||
|
|
@ -163,7 +163,6 @@ TOOLARGS="-x $LDAP_TOOLARGS"
|
|||
TOOLPROTO="-P 3"
|
||||
|
||||
# cmds
|
||||
LDIFFILTER=$SRCDIR/scripts/acfilter.sh
|
||||
CONFFILTER=$SRCDIR/scripts/conf.sh
|
||||
|
||||
MONITORDATA=$SRCDIR/scripts/monitor_data.sh
|
||||
|
|
@ -192,6 +191,7 @@ LDAPWHOAMI="$CLIENTDIR/ldapwhoami $TOOLARGS"
|
|||
LDAPCOMPARE="$CLIENTDIR/ldapcompare $TOOLARGS"
|
||||
LDAPEXOP="$CLIENTDIR/ldapexop $TOOLARGS"
|
||||
SLAPDTESTER=$PROGDIR/slapd-tester
|
||||
LDIFFILTER=$PROGDIR/ldif-filter
|
||||
LVL=${SLAPD_DEBUG-261}
|
||||
LOCALHOST=localhost
|
||||
BASEPORT=${SLAPD_BASEPORT-9010}
|
||||
|
|
|
|||
|
|
@ -344,9 +344,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 < $RELAYOUT > $LDIFFLT
|
||||
$LDIFFILTER < $RELAYOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -550,9 +550,9 @@ case $RC in
|
|||
esac
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif..."
|
||||
. $LDIFFILTER < $SQLREAD > $LDIFFLT
|
||||
$LDIFFILTER < $SQLREAD > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $LDIFFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $LDIFFLT
|
||||
|
||||
if test "${RDBMSWRITE}" != "yes"; then
|
||||
echo "write test disabled for ${RDBMS}; set SLAPD_USE_SQLWRITE=yes to enable"
|
||||
|
|
@ -124,7 +124,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -549,9 +549,9 @@ EOMODS
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering modified ldif..."
|
||||
. $LDIFFILTER < $SQLWRITE > $LDIFFLT
|
||||
$LDIFFILTER < $SQLWRITE > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -122,9 +122,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results from master..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering ldapsearch results from slave..."
|
||||
. $LDIFFILTER < $SEARCHOUT2 > $SEARCHFLT2
|
||||
$LDIFFILTER < $SEARCHOUT2 > $SEARCHFLT2
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $SEARCHFLT2 > $CMPOUT
|
||||
|
||||
|
|
@ -620,9 +620,9 @@ EOMODS
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering modified ldif..."
|
||||
. $LDIFFILTER < $SQLWRITE > $LDIFFLT
|
||||
$LDIFFILTER < $SQLWRITE > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -668,9 +668,9 @@ EOMODS
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results from master..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering ldapsearch results from slave..."
|
||||
. $LDIFFILTER < $SEARCHOUT2 > $SEARCHFLT2
|
||||
$LDIFFILTER < $SEARCHOUT2 > $SEARCHFLT2
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $SEARCHFLT2 > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -48,9 +48,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 < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -48,9 +48,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 < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -58,9 +58,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 < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -65,9 +65,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 < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -133,9 +133,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIF=$SEARCHOUTMASTER
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -216,9 +216,9 @@ fi
|
|||
LDIF=$MODIFYOUTMASTER
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -98,9 +98,9 @@ fi
|
|||
LDIF=$MODRDNOUTMASTER1
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -125,9 +125,9 @@ fi
|
|||
LDIF=$MODRDNOUTMASTER2
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -169,9 +169,9 @@ fi
|
|||
LDIF=$MODRDNOUTMASTER0
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -209,9 +209,9 @@ fi
|
|||
LDIF=$MODRDNOUTMASTER3
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -652,9 +652,9 @@ fi
|
|||
LDIF=$ACLOUTMASTER
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -82,9 +82,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 < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -163,9 +163,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIF=$SEARCHOUTMASTER
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -56,9 +56,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 < $LDIFGLUED > $LDIFFLT
|
||||
$LDIFFILTER < $LDIFGLUED > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -65,9 +65,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 < $LDIFGLUED > $LDIFFLT
|
||||
$LDIFFILTER < $LDIFGLUED > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -99,9 +99,9 @@ fi
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering language ldif ..."
|
||||
. $LDIFFILTER < $LDIFLANGOUT > $LDIFFLT
|
||||
$LDIFFILTER < $LDIFLANGOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -229,10 +229,10 @@ LDIF=$SEARCHOUTMASTER
|
|||
LDIF2=$SEARCHOUTX
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
. $LDIFFILTER < $LDIF2 >> $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF2 >> $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -178,9 +178,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
|
||||
LDIF=$SEARCHOUTMASTER
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering expected LDIF for comparison..."
|
||||
. $LDIFFILTER < $REFERRALOUT > $LDIFFLT
|
||||
$LDIFFILTER < $REFERRALOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -337,9 +337,9 @@ fi
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo "Filtering producer results..."
|
||||
. $LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
$LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
echo "Filtering consumer results..."
|
||||
. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
|
||||
echo "Comparing retrieved entries from producer and consumer..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
|
|||
|
|
@ -383,9 +383,9 @@ fi
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo "Filtering producer results..."
|
||||
. $LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
$LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
echo "Filtering consumer results..."
|
||||
. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
|
||||
echo "Comparing retrieved entries from producer and consumer..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
|
|||
|
|
@ -433,17 +433,17 @@ fi
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo "Filtering master ldapsearch results..."
|
||||
. $LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
$LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
echo "Filtering R1 slave ldapsearch results..."
|
||||
. $LDIFFILTER < $SERVER2OUT > $SERVER2FLT
|
||||
$LDIFFILTER < $SERVER2OUT > $SERVER2FLT
|
||||
echo "Filtering R2 slave ldapsearch results..."
|
||||
. $LDIFFILTER < $SERVER3OUT > $SERVER3FLT
|
||||
$LDIFFILTER < $SERVER3OUT > $SERVER3FLT
|
||||
echo "Filtering P1 slave ldapsearch results..."
|
||||
. $LDIFFILTER < $SERVER4OUT > $SERVER4FLT
|
||||
$LDIFFILTER < $SERVER4OUT > $SERVER4FLT
|
||||
echo "Filtering P2 slave ldapsearch results..."
|
||||
. $LDIFFILTER < $SERVER5OUT > $SERVER5FLT
|
||||
$LDIFFILTER < $SERVER5OUT > $SERVER5FLT
|
||||
echo "Filtering P3 slave ldapsearch results..."
|
||||
. $LDIFFILTER < $SERVER6OUT > $SERVER6FLT
|
||||
$LDIFFILTER < $SERVER6OUT > $SERVER6FLT
|
||||
|
||||
echo "Comparing retrieved entries from master and R1 slave..."
|
||||
$CMP $MASTERFLT $SERVER2FLT > $CMPOUT
|
||||
|
|
|
|||
|
|
@ -455,9 +455,9 @@ else
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif..."
|
||||
. $LDIFFILTER < $PROXYCACHEOUT > $LDIFFLT
|
||||
$LDIFFILTER < $PROXYCACHEOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -307,9 +307,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIF=$CERTIFICATETLS
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -160,9 +160,9 @@ fi
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original data..."
|
||||
. $LDIFFILTER < $DNOUT > $LDIFFLT
|
||||
$LDIFFILTER < $DNOUT > $LDIFFLT
|
||||
echo "Comparing ldapsearch results against original..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ wait
|
|||
LDIFOUT=$EMPTYDNOUT1
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Comparing ldapsearch results against original..."
|
||||
$CMP $SEARCHFLT $LDIFOUT > $CMPOUT
|
||||
|
||||
|
|
@ -157,7 +157,7 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIFOUT=$EMPTYDNOUT2
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Comparing ldapsearch results against original..."
|
||||
$CMP $SEARCHFLT $LDIFOUT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -205,9 +205,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 < $IDASSERTOUT > $LDIFFLT
|
||||
$LDIFFILTER < $IDASSERTOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -232,9 +232,9 @@ if test $USE_SASL != "no" ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $IDASSERTOUT > $LDIFFLT
|
||||
$LDIFFILTER < $IDASSERTOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -149,9 +149,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 < $LDAPGLUEOUT > $LDIFFLT
|
||||
$LDIFFILTER < $LDAPGLUEOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -174,9 +174,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 < $LDAPGLUEANONYMOUSOUT > $LDIFFLT
|
||||
$LDIFFILTER < $LDAPGLUEANONYMOUSOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -202,9 +202,9 @@ if test $USE_SASL != "no" ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDAPGLUEOUT > $LDIFFLT
|
||||
$LDIFFILTER < $LDAPGLUEOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ fi
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $COMPSEARCHOUT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -116,9 +116,9 @@ for P in $PORT1 $PORT2 ; do
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $CHAINOUT > $LDIFFLT
|
||||
$LDIFFILTER < $CHAINOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -140,9 +140,9 @@ for P in $PORT1 $PORT2 ; do
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $CHAINREFOUT > $LDIFFLT
|
||||
$LDIFFILTER < $CHAINREFOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -269,9 +269,9 @@ for P in $PORT1 $PORT2 ; do
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $CHAINMODOUT > $LDIFFLT
|
||||
$LDIFFILTER < $CHAINMODOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ echo "Waiting $SLEEP1 seconds for shadow subtrees to sync..."
|
|||
sleep $SLEEP1
|
||||
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $GLUESYNCOUT > $LDIFFLT
|
||||
$LDIFFILTER < $GLUESYNCOUT > $LDIFFLT
|
||||
|
||||
for P in $PORT1 $PORT2 ; do
|
||||
echo "Using ldapsearch to read all the entries from port $P..."
|
||||
|
|
@ -152,7 +152,7 @@ for P in $PORT1 $PORT2 ; do
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < "${SEARCHOUT}.${P}" > $SEARCHFLT
|
||||
$LDIFFILTER < "${SEARCHOUT}.${P}" > $SEARCHFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -156,8 +156,8 @@ if test $RC != 0 ; then
|
|||
exit $RC
|
||||
fi
|
||||
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
. $LDIFFILTER < $LDIFTRANSLUCENTDATA > $LDIFFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $LDIFTRANSLUCENTDATA > $LDIFFLT
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
if test $? != 0 ; then
|
||||
|
|
@ -244,7 +244,7 @@ if test $RC != 0 ; then
|
|||
exit $RC
|
||||
fi
|
||||
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$CMP $SEARCHFLT $LDIFTRANSLUCENTMERGED > $CMPOUT
|
||||
|
||||
if test $? != 0 ; then
|
||||
|
|
|
|||
|
|
@ -525,9 +525,9 @@ case $RC in
|
|||
esac
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $METAOUT > $LDIFFLT
|
||||
$LDIFFILTER < $METAOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -218,9 +218,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..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -201,9 +201,9 @@ fi
|
|||
LDIF=$MANAGEOUT
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -207,9 +207,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..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -194,9 +194,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIF=$SUBTREERENAMEOUT
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -243,9 +243,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIF=$ACIOUT
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $VALSORTOUT1 > $CMPOUT
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $VALSORTOUT2 > $CMPOUT
|
||||
|
||||
|
|
@ -204,7 +204,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $VALSORTOUT3 > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -339,9 +339,9 @@ fi
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo "Filtering producer results..."
|
||||
. $LDIFFILTER < $MASTEROUT | grep -iv "^auditcontext:" > $MASTERFLT
|
||||
$LDIFFILTER < $MASTEROUT | grep -iv "^auditcontext:" > $MASTERFLT
|
||||
echo "Filtering consumer results..."
|
||||
. $LDIFFILTER < $SLAVEOUT | grep -iv "^auditcontext:" > $SLAVEFLT
|
||||
$LDIFFILTER < $SLAVEOUT | grep -iv "^auditcontext:" > $SLAVEFLT
|
||||
|
||||
echo "Comparing retrieved entries from producer and consumer..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
|
|||
|
|
@ -603,9 +603,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIF=$DYNLISTOUT
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -230,9 +230,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -420,9 +420,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -527,9 +527,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -616,9 +616,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -713,9 +713,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -758,7 +758,7 @@ if test $? != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.5.1" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.5.1" > $SLAVEFLT
|
||||
|
||||
echo " ${CHECK}.1 < Comparing retrieved entries from master and slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -853,9 +853,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
|
|||
|
|
@ -530,9 +530,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIF=$DDSOUT
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -525,9 +525,9 @@ case $RC in
|
|||
esac
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $METAOUT > $LDIFFLT
|
||||
$LDIFFILTER < $METAOUT > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -185,9 +185,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.1" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.1" > $MASTERFLT
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and P1 slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -210,7 +210,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and R1 slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -369,9 +369,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.2" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.2" > $MASTERFLT
|
||||
#echo "Filtering P1 slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and P1 slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -394,7 +394,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and R1 slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -480,9 +480,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.3" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.3" > $MASTERFLT
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and P1 slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -505,7 +505,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and R1 slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -561,9 +561,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering master results..."
|
||||
. $LDIFFILTER < "${MASTEROUT}.4" > $MASTERFLT
|
||||
$LDIFFILTER < "${MASTEROUT}.4" > $MASTERFLT
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and P1 slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -586,7 +586,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
#echo "Filtering slave results..."
|
||||
. $LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT
|
||||
$LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT
|
||||
|
||||
echo "$CHECK < Comparing retrieved entries from master and R1 slave..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
|
|||
|
|
@ -348,9 +348,9 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering producer results..."
|
||||
. $LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
$LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
echo "Filtering consumer results..."
|
||||
. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
|
||||
echo "Comparing retrieved configs from producer and consumer..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
@ -386,9 +386,9 @@ fi
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo "Filtering producer results..."
|
||||
. $LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
$LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
echo "Filtering consumer results..."
|
||||
. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
|
||||
echo "Comparing retrieved entries from producer and consumer..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ if test $RC != 0 ; then
|
|||
exit $RC
|
||||
fi
|
||||
|
||||
. $LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
$LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
|
||||
n=`expr $n + 1`
|
||||
done
|
||||
|
|
@ -388,7 +388,7 @@ if test $RC != 0 ; then
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
. $LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
$LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
n=`expr $n + 1`
|
||||
done
|
||||
|
||||
|
|
@ -433,7 +433,7 @@ if test $RC != 0 ; then
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
. $LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
$LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
n=`expr $n + 1`
|
||||
done
|
||||
|
||||
|
|
@ -483,7 +483,7 @@ if test $RC != 0 ; then
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
. $LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
$LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
n=`expr $n + 1`
|
||||
done
|
||||
|
||||
|
|
@ -546,7 +546,7 @@ if test $RC != 0 ; then
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
. $LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
$LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
n=`expr $n + 1`
|
||||
done
|
||||
|
||||
|
|
@ -610,7 +610,7 @@ if test $RC != 0 ; then
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
. $LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
$LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
n=`expr $n + 1`
|
||||
done
|
||||
|
||||
|
|
@ -762,7 +762,7 @@ if test $RC != 0 ; then
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
exit $RC
|
||||
fi
|
||||
. $LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
$LDIFFILTER < $TESTDIR/server$n.out > $TESTDIR/server$n.flt
|
||||
n=`expr $n + 1`
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -330,9 +330,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIF=$MEMBEROFOUT
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -363,9 +363,9 @@ fi
|
|||
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
||||
|
||||
echo "Filtering producer results..."
|
||||
. $LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
$LDIFFILTER < $MASTEROUT > $MASTERFLT
|
||||
echo "Filtering consumer results..."
|
||||
. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
|
||||
|
||||
echo "Comparing retrieved entries from producer and consumer..."
|
||||
$CMP $MASTERFLT $SLAVEFLT > $CMPOUT
|
||||
|
|
|
|||
|
|
@ -69,9 +69,9 @@ fi
|
|||
# Compare results, ignoring possible difference of IPv4/IPv6 localhost address
|
||||
localrewrite='s/=127\.0\.0\.1:/=LOCAL:/; s/=\[::1\]:/=LOCAL:/'
|
||||
echo "Filtering ldapsearch results..."
|
||||
sed -e "$localrewrite" < $SEARCHOUT | . $LDIFFILTER > $SEARCHFLT
|
||||
sed -e "$localrewrite" < $SEARCHOUT | $LDIFFILTER > $SEARCHFLT
|
||||
echo "Filtering expected data..."
|
||||
. $CONFFILTER < $MONITOROUT1 | sed -e "$localrewrite" | . $LDIFFILTER > $LDIFFLT
|
||||
. $CONFFILTER < $MONITOROUT1 | sed -e "$localrewrite" | $LDIFFILTER > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
|
||||
TMPMONITOROUT2=$MONITOROUT2
|
||||
case $BACKEND in
|
||||
|
|
@ -132,7 +132,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $MONITOROUT3 > $CMPOUT
|
||||
|
|
@ -157,7 +157,7 @@ if test $RC != 0 ; then
|
|||
fi
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $MONITOROUT4 > $CMPOUT
|
||||
|
|
|
|||
|
|
@ -256,9 +256,9 @@ test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|||
LDIF=$MEMBEROFREFINTOUT
|
||||
|
||||
echo "Filtering ldapsearch results..."
|
||||
. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
|
||||
echo "Filtering original ldif used to create database..."
|
||||
. $LDIFFILTER < $LDIF > $LDIFFLT
|
||||
$LDIFFILTER < $LDIF > $LDIFFLT
|
||||
echo "Comparing filter output..."
|
||||
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue