Add ITS# to CHANGES

import proxy authz test

diff --git a/CHANGES b/CHANGES
index ad7021e86886c2bebad207fa4ef14a3096ba4de9..7e7bdff094b8143ca19f80915f18792403300f17 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,26 +1,28 @@
 OpenLDAP 2.1 Change Log
 
 OpenLDAP 2.1.13 Engineering
-       Fixed back-bdb group ACL deadlock bug
-       Fixed slapd RDN handling
+       Fixed back-bdb group ACL deadlock bug (ITS#2195)
+       Fixed slapd RDN handling (ITS#2243)
+       Fixed slap tools argument handling (ITS#2266)
+       Fixed liblber PROTOS bugs (ITS#2275) (ITS#2280)
+       Fixed ber_flush debug level
+       Fixed libldap SASL null cred bug (ITS#2267)
+       Fixed slapd SASL anon bugs (ITS#2268)
+       Fixed back-glue exceeded results bug (ITS#2299)
+       Fixed back-glue search reference bug
        Changed slapd DNS reverse lookups default to off
-       Added slapd ACL caching
-       Added slapd attribute options enhancement
-       Added slapd ldapi// SASL EXTERNAL support
        Updated slapd bind stats logging
        Updated slapd proxy authorization support
-       Added back-glue reference support
-       Fixed back-glue exceeded results bug
-       Updated back-ldap and back-meta
        Updated libldap TLS certificate checking (ITS#2161)
        Updated client tool argument handling
        Updated liblutil detach handling
+       Updated back-ldap, back-meta, back-sql
+       Added slapd ACL caching
+       Added slapd attribute options enhancement
+       Added slapd ldapi// SASL EXTERNAL support
        Added libldap ldap_whoami routines
        Added liblber ber_flatten2 routine
        Added liblutil passwd sanity checks (ITS#2159)
-       Fixed liblber PROTOS bugs (ITS#2275) (ITS#2280)
-       Fixed ber_flush debug level
-       Fixed libldap NULL cred bug (ITS#2267)
        Build Environment
                Check back-bdb requirement for BDB 4.1
                Remove configure flags for deprecated features

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 703b199f4b0addf63672b0e9ff76a1dfe10f2cb6..28978c50171aa215693d58933eeb3a43a83a11e0 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -5,4 +5,8 @@ if [ x"$MONITORDB" = x"yes" ] ; then
 else
        MON=nomonitor
 fi
-sed -e "s/@BACKEND@/$BACKEND/" -e "s/^#$BACKEND#//"  -e "s/^#$MON#//"
+sed -e "s/@BACKEND@/${BACKEND}/"       \
+       -e "s/^#${BACKEND}#//"                  \
+       -e "s/^#${MON}#//"                              \
+       -e "s/@PORT@/${PORT}/"                  \
+       -e "s/@SLAVEPORT@/${SLAVEPORT}/"

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index ed726d12e582f927957d762a50b255b05a164529..f514d3c6f1b75a844475e9659dac0248684856ca 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -52,7 +52,7 @@ LDAPPASSWD="$CLIENTDIR/ldappasswd $TOOLARGS"
 LDAPSEARCH="$CLIENTDIR/ldapsearch $TOOLPROTO $TOOLARGS -LLL"
 LDAPRSEARCH="$CLIENTDIR/ldapsearch $TOOLPROTO $TOOLARGS"
 LDAPMODIFY="$CLIENTDIR/ldapmodify $TOOLPROTO $TOOLARGS"
-LDAPADD="$CLIENTDIR/ldapmodify -a $TOOLPROTO $TOOLARGS"
+LDAPADD="$CLIENTDIR/ldapadd $TOOLPROTO $TOOLARGS"
 LDAPMODRDN="$CLIENTDIR/ldapmodrdn $TOOLPROTO $TOOLARGS"
 LDAPWHOAMI="$CLIENTDIR/ldapwhoami $TOOLARGS"
 SLAPDTESTER=$PROGDIR/slapd-tester

diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami
index b6aea511cc0b1b57f2269d2ea565daaaec0a9a62..d120c556601830ef6b2d3f20a251e5d0a7b98612 100755 (executable)
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@@ -66,6 +66,39 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+echo "Testing ldapwhoami as ${MANAGERDN} for anonymous..."
+$LDAPWHOAMI -h $LOCALHOST -p $PORT -D "$MANAGERDN" -w $PASSWD \
+       -e \!authzid=""
+
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapwhoami failed ($RC)!"
+       kill -HUP $PID
+       exit $RC
+fi
+
+echo "Testing ldapwhoami as ${MANAGERDN} for dn:$BABSDN..."
+$LDAPWHOAMI -h $LOCALHOST -p $PORT -D "$MANAGERDN" -w $PASSWD \
+       -e \!authzid="dn:$BABSDN"
+
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapwhoami failed ($RC)!"
+       kill -HUP $PID
+       exit $RC
+fi
+
+echo "Testing ldapwhoami as ${MANAGERDN} for u:ursula..."
+$LDAPWHOAMI -h $LOCALHOST -p $PORT -D "$MANAGERDN" -w $PASSWD \
+       -e \!authzid="u:ursula"
+
+RC=$?
+if test $RC != 0 ; then
+       echo "ldapwhoami failed ($RC)!"
+       kill -HUP $PID
+       exit $RC
+fi
+
 kill -HUP $PID
 
 echo ">>>>> Test succeeded"