ITS#6404

diff --git a/CHANGES b/CHANGES
index 3122749491c366b688852933a6d3c1f9d4ec3008..a6d2ead26d03f3ed516fe6aa6c20e32efca165d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,10 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.25 Engineering
-       Fixed libldap/lberl/util if/else usage (ITS#6832)
+       Build Environment
+               Fixed libldap/lberl/util if/else usage (ITS#6832)
+               Fixed Windows odbc32 detection (ITS#6125)
+               Fixed test020 exit codes (ITS#6404)
 
 OpenLDAP 2.4.24 Release (2011/02/10)
        Added LDIF line wrapping setting (ITS#6645)

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index fa8f38463c0d4d549f516cd63da34bf25900aeca..373b914ce40c6495204af36262760ef8469ec9fc 100755 (executable)
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -152,7 +152,7 @@ fi
 grep "query template" $LOG2 > /dev/null
 RC=$?
 if test $RC != 0 ; then
-       echo "Debug messages unavailable, test aborted..."
+       echo "Debug messages unavailable, remaining test skipped..."
        test $KILLSERVERS != no && kill -HUP $KILLPIDS && wait
        exit 0
 fi
@@ -256,7 +256,7 @@ case $RC in
 0)
        echo "ldapsearch should have failed!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
        ;;
 4)
        echo "ldapsearch failed ($RC)"
@@ -283,7 +283,7 @@ case $RC in
 0)
        echo "ldapsearch should have failed!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
        ;;
 4)
        echo "ldapsearch failed ($RC)"
@@ -406,7 +406,7 @@ case $RC in
 0)
        echo "ldapsearch should have failed!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
        ;;
 4)
        echo "ldapsearch failed ($RC)"
@@ -433,7 +433,7 @@ case $RC in
 0)
        echo "ldapsearch should have failed!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit 1
        ;;
 4)
        echo "ldapsearch failed ($RC)"