Diff for /tests/scripts/test031-component-filter between versions 1.3 and 1.4

version 1.3, 2004/09/26 20:53:26 version 1.4, 2004/10/27 17:37:04
Line 18  echo "running defines.sh" Line 18  echo "running defines.sh"
   
 ## If you use this script then  ## If you use this script then
 ## Make sure that you turn on LDAP_COMP_MATCH in slapd source codes  ## Make sure that you turn on LDAP_COMP_MATCH in slapd source codes
 ## To disable, set "WITH_COMP_MATCH=no" in source_root/openldap/tests/run.in  ## and --enable-modules  is configured yes
 if test "$AC_WITH_COMP_MATCH" != "yes" ; then  if test "$AC_WITH_MODULES_ENABLED" != "yes" ; then
         echo "test disabled "          echo "dynamic module disabled "
         exit          exit
 fi  fi
   
 mkdir -p $TESTDIR $DBDIR1  mkdir -p $TESTDIR $DBDIR1
   
   ## Make sure that you set a proper path to component matching 
   ## module directory in $COMPCONF
   ## moduleload path/to/component/library/compmatch.la
   ## otherwise it fails to execute slapd
 echo "Running slapadd to build slapd database..."  echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $COMPCONF > $ADDCONF  . $CONFFILTER $BACKEND $MONITORDB < $COMPCONF > $ADDCONF
 $SLAPADD -f $ADDCONF -l $LDIFCOMPMATCH  $SLAPADD -f $ADDCONF -l $LDIFCOMPMATCH
 RC=$?  RC=$?
 if test $RC != 0 ; then  if test $RC != 0 ; then
         echo "slapadd failed ($RC)!"          echo "slapadd failed ($RC)!"
         exit $RC          echo "Be sure to have a certificate module in tests/data/comp_libs "
           echo "The module is in openldap/contrib/slapd-modules/comp_match"
           exit 
 fi  fi
   
 echo "Running slapindex to index slapd database..."  echo "Running slapindex to index slapd database..."
Line 73  fi Line 79  fi
   
 cat /dev/null > $SEARCHOUT  cat /dev/null > $SEARCHOUT
   
 echo "Testing Component Filter Match RFC3687 searching:"  echo "Testing Component Filter Match RFC3687 Certificate searching:"
 echo "# Testing Component Filter Match RFC3687 searching:" >> $SEARCHOUT  echo "# Testing Component Filter Match RFC3687 Certificate searching:" >> $SEARCHOUT
   
 FILTER="(componentTest:componentFilterMatch:=item:{ component \"id\", rule caseExactMatch, value \"worldcup\" )"  FILTER="(componentCertificate:componentCertificateMatch:=item:{ component \"tbsCertificate.serialNumber\", rule allComponentsMatch, value 0 })"
 echo "        f=$FILTER ..."  echo "        f=$FILTER ..."
 echo "#         f=$FILTER ..." >> $SEARCHOUT  echo "#         f=$FILTER ..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \  $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
Line 89  if test $RC != 0 ; then Line 95  if test $RC != 0 ; then
         exit $RC          exit $RC
 fi  fi
   
 FILTER="(componentTest:componentFilterMatch:=not:item:{ component \"id2\", rule caseExactMatch, value \"worldcup\" )"  FILTER="(componentCertificate:componentCertificateMatch:=item:{ component \"tbsCertificate.version\", rule allComponentsMatch, value 2 })"
 echo "        f=$FILTER ..."  echo "        f=$FILTER ..."
 echo "#         f=$FILTER ..." >> $SEARCHOUT  echo "#         f=$FILTER ..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \  $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
Line 102  if test $RC != 0 ; then Line 108  if test $RC != 0 ; then
         exit $RC          exit $RC
 fi  fi
   
 FILTER="(componentTest:componentFilterMatch:=not:item:{ component \"id2\", rule componentFilterMatch, value not:item:{ component \"id.0\", rule integerMatch, value 5 }})"  FILTER="(componentCertificate:componentCertificateMatch:=item:{ component \"tbsCertificate.issuer.rdnSequence.1.1.value\", rule octetStringMatch, value \"US\" })"
 echo "        f=$FILTER ..."  echo "        f=$FILTER ..."
 echo "#         f=$FILTER ..." >> $SEARCHOUT  echo "#         f=$FILTER ..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \  $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
Line 115  if test $RC != 0 ; then Line 121  if test $RC != 0 ; then
         exit $RC          exit $RC
 fi  fi
   
 FILTER="(componentTest:componentFilterMatch:=and:{item:{ component \"100\", rule caseIgnoreMatch, value "foobar" },item:{ component \"id2.rr.kk\", rule componentFilterMatch, value item:{ component \"id3\", rule integerMatch, value 1 }}})"  FILTER="(componentCertificate:componentCertificateMatch:=item:{ component \"tbsCertificate.issuer.rdnSequence.1.1.value\", rule allComponentsMatch, value \"US\" })"
 echo "        f=$FILTER ..."  echo "        f=$FILTER ..."
 echo "#         f=$FILTER ..." >> $SEARCHOUT  echo "#         f=$FILTER ..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \  $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
Line 128  if test $RC != 0 ; then Line 134  if test $RC != 0 ; then
         exit $RC          exit $RC
 fi  fi
   
 FILTER="(componentTest:componentFilterMatch:=and:{not:item:{ component \"100\", rule caseIgnoreMatch, value "foobar" },not:item:{ component \"id2.rr.kk\", rule componentFilterMatch, value item:{ component \"id3\", rule integerMatch, value 1 }}})"  FILTER="(componentCertificate:componentCertificateMatch:=item:{ component \"tbsCertificate.issuer.rdnSequence\", rule allComponentsMatch, value { { { type 2.5.4.6 , value \"US\" } } } })"
 echo "        f=$FILTER ..."  echo "        f=$FILTER ..."
 echo "#         f=$FILTER ..." >> $SEARCHOUT  echo "#         f=$FILTER ..." >> $SEARCHOUT
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \  $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
Line 141  if test $RC != 0 ; then Line 147  if test $RC != 0 ; then
         exit $RC          exit $RC
 fi  fi
   
 FILTER="(componentTest:componentFilterMatch:=or:{not:item:{ component \"100\", rule caseIgnoreMatch, value "foobar" },not:item:{ component \"id2.rr.kk\", rule componentFilterMatch, value item:{ component \"id3\", rule integerMatch, value 1 }}})"  
 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)!"  
         test $KILLSERVERS != no && kill -HUP $KILLPIDS  
         exit $RC  
 fi  
 test $KILLSERVERS != no && kill -HUP $KILLPIDS  test $KILLSERVERS != no && kill -HUP $KILLPIDS
   
 echo "Filtering ldapsearch results..."  echo "Filtering ldapsearch results..."

Removed from v.1.3  
changed lines
  Added in v.1.4


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org