Merge remote branch 'origin/mdb.master'

[openldap] / tests / scripts / test021-certificate

diff --git a/tests/scripts/test021-certificate b/tests/scripts/test021-certificate
index 150df453fe75cfdba77251db3dd5c100a00ec329..7663d0e394ff47a7f732b37a1c0a2cfad17d058b 100755 (executable)
--- a/tests/scripts/test021-certificate
+++ b/tests/scripts/test021-certificate
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2006 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -16,11 +16,6 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-if test "$AC_WITH_TLS" != "yes" ; then
-       echo "test disabled, requires --with-tls"
-       exit 0
-fi
-
 mkdir -p $TESTDIR $DBDIR1
 
 echo "Running slapadd to build slapd database..."
@@ -77,7 +72,7 @@ changetype: modify
 add: objectClass
 objectClass: extensibleObject
 -
-add: cAcertificate
+add: cAcertificate;binary
 cAcertificate;binary::
  MIIDVDCCAr2gAwIBAgIBADANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQGEwJVUzET
  MBEGA1UECBMKQ2FsaWZvcm5pYTEfMB0GA1UEChMWT3BlbkxEQVAgRXhhbXBsZSwg
@@ -103,7 +98,7 @@ changetype: modify
 add: objectClass
 objectClass: strongAuthenticationUser
 -
-add: userCertificate
+add: userCertificate;binary
 userCertificate;binary::
  MIIDazCCAtSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQGEwJVUzET
  MBEGA1UECBMKQ2FsaWZvcm5pYTEfMB0GA1UEChMWT3BlbkxEQVAgRXhhbXBsZSwg
@@ -130,7 +125,7 @@ changetype: modify
 add: objectClass
 objectClass: strongAuthenticationUser
 -
-add: userCertificate
+add: userCertificate;binary
 userCertificate;binary::
  MIIDcDCCAtmgAwIBAgIBATANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQGEwJVUzET
  MBEGA1UECBMKQ2FsaWZvcm5pYTEfMB0GA1UEChMWT3BlbkxEQVAgRXhhbXBsZSwg
@@ -309,17 +304,12 @@ fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
-if test "$WITHTLS" = no ; then 
-       echo "Certificate matching not suported without TLS"
-       LDIF=$CERTIFICATEOUT
-else
-       LDIF=$CERTIFICATETLS
-fi 
+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