mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-12 15:10:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix test; don't return error when relaying exops

Browse Source
This commit is contained in:
Pierangelo Masarati 2008-01-15 21:59:23 +00:00
parent e9a90cc77d
commit 440099d271
3 changed files with 689 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
servers/slapd/back-relay/op.c
View File

@ -63,10 +63,10 @@ relay_back_select_backend( Operation *op, SlapReply *rs, int err, int dosend )
if ( bd == NULL && !BER_BVISNULL( &op->o_req_ndn ) ) {
bd = select_backend( &op->o_req_ndn, 1 );
if ( bd == op->o_bd ) {
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
rs->sr_text = "back-relay would call self";
if ( err > LDAP_SUCCESS && dosend ) {
send_ldap_error( op, rs,
LDAP_UNWILLING_TO_PERFORM,
"back-relay would call self" );
send_ldap_result( op, rs );
}
return NULL;
}
@ -123,7 +123,7 @@ relay_back_op_bind( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_INVALID_CREDENTIALS, 1 );
if ( bd == NULL ) {
return rc;
return rs->sr_err;
}
if ( bd->be_bind ) {
@ -157,7 +157,7 @@ relay_back_op_unbind( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_SUCCESS, 0 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd && bd->be_unbind ) {
@ -187,7 +187,7 @@ relay_back_op_search( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_NO_SUCH_OBJECT, 1 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd->be_search ) {
@ -222,7 +222,7 @@ relay_back_op_compare( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_NO_SUCH_OBJECT, 1 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd->be_compare ) {
@ -257,7 +257,7 @@ relay_back_op_modify( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_NO_SUCH_OBJECT, 1 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd->be_modify ) {
@ -292,7 +292,7 @@ relay_back_op_modrdn( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_NO_SUCH_OBJECT, 1 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd->be_modrdn ) {
@ -327,7 +327,7 @@ relay_back_op_add( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_NO_SUCH_OBJECT, 1 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd->be_add ) {
@ -362,7 +362,7 @@ relay_back_op_delete( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_NO_SUCH_OBJECT, 1 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd->be_delete ) {
@ -392,7 +392,7 @@ relay_back_op_abandon( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_SUCCESS, 0 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd->be_abandon ) {
@ -422,7 +422,7 @@ relay_back_op_cancel( Operation *op, SlapReply *rs )
bd = relay_back_select_backend( op, rs, LDAP_CANNOT_CANCEL, 0 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd->be_cancel ) {
@ -453,11 +453,11 @@ int
relay_back_op_extended( Operation *op, SlapReply *rs )
{
BackendDB *bd;
int rc = 1;
int rc;
bd = relay_back_select_backend( op, rs, LDAP_NO_SUCH_OBJECT, 0 );
if ( bd == NULL ) {
return 1;
return rs->sr_err;
}
if ( bd->be_extended ) {
@ -475,9 +475,8 @@ relay_back_op_extended( Operation *op, SlapReply *rs )
}
} else {
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"operation not supported "
"within naming context" );
rc = rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
rs->sr_text = "operation not supported within naming context";
}
return rc;

1320
tests/data/relay.out
View File

File diff suppressed because it is too large Load Diff

24
tests/scripts/relay
View File

@ -61,7 +61,7 @@ cat /dev/null > $SEARCHOUT
BASEDN="dc=example,dc=com"
echo "Searching base=\"$BASEDN\"..."
echo "# searching base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "Search failed ($RC)!"
@ -72,7 +72,7 @@ fi
BASEDN="o=Example,c=US"
echo "Searching base=\"$BASEDN\"..."
echo "# searching base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "Search failed ($RC)!"
@ -83,7 +83,7 @@ fi
BASEDN="o=Esempio,c=IT"
echo "Searching base=\"$BASEDN\"..."
echo "# searching base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "Search failed ($RC)!"
@ -94,7 +94,7 @@ fi
BASEDN="o=Beispiel,c=DE"
echo "Searching base=\"$BASEDN\"..."
echo "# searching base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "Search failed ($RC)!"
@ -233,7 +233,7 @@ fi
echo "Searching base=\"$BASEDN\"..."
echo "# searching base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "Search failed ($RC)!"
@ -244,7 +244,7 @@ fi
BASEDN="o=Esempio,c=IT"
echo "Searching base=\"$BASEDN\"..."
echo "# searching base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" >> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "Search failed ($RC)!"
@ -261,7 +261,7 @@ echo "# attrs=\"'*' ref\"" >> $SEARCHOUT
BASEDN="dc=example,dc=com"
echo " base=\"$BASEDN\"..."
echo "# base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" '*' ref \
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" '*' ref \
>> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
@ -273,7 +273,7 @@ fi
BASEDN="o=Example,c=US"
echo " base=\"$BASEDN\"..."
echo "# base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" '*' ref \
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" '*' ref \
>> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
@ -285,7 +285,7 @@ fi
BASEDN="o=Esempio,c=IT"
echo " base=\"$BASEDN\"..."
echo "# base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" '*' ref \
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" -M "$FILTER" '*' ref \
>> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
@ -302,7 +302,7 @@ echo " base=\"$BASEDN\"..."
echo "# searching filter=\"$FILTER\"" >> $SEARCHOUT
echo "# attrs=\"seeAlso\"" >> $SEARCHOUT
echo "# base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" seeAlso \
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" seeAlso \
>> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
@ -318,7 +318,7 @@ echo " base=\"$BASEDN\"..."
echo "# searching filter=\"$FILTER\"" >> $SEARCHOUT
echo "# attrs=\"uid\"" >> $SEARCHOUT
echo "# base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" uid \
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" uid \
>> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then
@ -334,7 +334,7 @@ echo " base=\"$BASEDN\"..."
echo "# searching filter=\"$FILTER\"" >> $SEARCHOUT
echo "# attrs=\"member\"" >> $SEARCHOUT
echo "# base=\"$BASEDN\"..." >> $SEARCHOUT
$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" member \
$LDAPSEARCH -S '' -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" member \
>> $SEARCHOUT 2>&1
RC=$?
if test $RC != 0 ; then