X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest015-xsearch;h=280afcbe6215d0bc8684c5564cf3ff976ece11f5;hb=3743a5a68e4d608949d5fd04904733ee5c1ac959;hp=72637ee7bbe3b6b09c76d1b1ff7cd5f17382d5d5;hpb=604f7fb9dbc3749f44364ca1867d8ee60831a192;p=openldap diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch index 72637ee7bb..280afcbe62 100755 --- a/tests/scripts/test015-xsearch +++ b/tests/scripts/test015-xsearch @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2006 The OpenLDAP Foundation. +## Copyright 1998-2012 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -156,6 +156,13 @@ echo "# f=$FILTER ..." >> $SEARCHOUT $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ "$FILTER" >> $SEARCHOUT 2>&1 +# ITS#4380: don't crash when a matchingRule without pretty/validate is used +FILTER="(:dn:caseIgnoreSubstringsMatch:=Information Technology Division)" +echo " f=$FILTER ..." +echo "# f=$FILTER ..." >> $SEARCHOUT +$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ + "$FILTER" >> $SEARCHOUT 2>&1 + RC=$? if test $RC != 0 ; then echo "ldapsearch failed ($RC)!" @@ -222,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