mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix compare; more manageDSAit cleanup

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-01-20 00:17:52 +00:00
parent 4f23e2e470
commit 0c601c5db2
5 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
servers/slapd/back-sql/compare.c
View File

@ -36,8 +36,8 @@ backsql_compare( Operation *op, SlapReply *rs )
Attribute *a = NULL;
backsql_srch_info bsi = { 0 };
int rc;
AttributeName anlist[2],
*anlistp = NULL;
int manageDSAit = get_manageDSAit( op );
AttributeName anlist[2];
Debug( LDAP_DEBUG_TRACE, "==>backsql_compare()\n", 0, 0, 0 );
@ -56,13 +56,6 @@ backsql_compare( Operation *op, SlapReply *rs )
anlist[ 0 ].an_desc = op->oq_compare.rs_ava->aa_desc;
BER_BVZERO( &anlist[ 1 ].an_name );
/*
* Try to get attr as dynamic operational
*/
if ( !is_at_operational( op->oq_compare.rs_ava->aa_desc->ad_type ) ) {
anlistp = anlist;
}
/*
* Get the entry
*/
@ -70,9 +63,28 @@ backsql_compare( Operation *op, SlapReply *rs )
rc = backsql_init_search( &bsi, &op->o_req_ndn,
LDAP_SCOPE_BASE,
SLAP_NO_LIMIT, SLAP_NO_LIMIT,
(time_t)(-1), NULL, dbh, op, rs, anlistp,
(time_t)(-1), NULL, dbh, op, rs, anlist,
( BACKSQL_ISF_MATCHED | BACKSQL_ISF_GET_ENTRY ) );
if ( rc != LDAP_SUCCESS ) {
switch ( rc ) {
case LDAP_SUCCESS:
break;
case LDAP_REFERRAL:
if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname ) )
{
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;
rs->sr_matched = NULL;
if ( rs->sr_ref ) {
ber_bvarray_free( rs->sr_ref );
rs->sr_ref = NULL;
}
break;
}
/* fallthru */
default:
Debug( LDAP_DEBUG_TRACE, "backsql_compare(): "
"could not retrieve compareDN ID - no such entry\n",
0, 0, 0 );
@ -89,10 +101,10 @@ backsql_compare( Operation *op, SlapReply *rs )
if ( is_at_operational( op->oq_compare.rs_ava->aa_desc->ad_type ) ) {
SlapReply nrs = { 0 };
Attribute **ap;
e.e_attrs = NULL;
ber_dupbv( &e.e_name, &bsi.bsi_base_id.eid_dn );
ber_dupbv( &e.e_nname, &bsi.bsi_base_id.eid_ndn );
for ( ap = &e.e_attrs; *ap; ap = &(*ap)->a_next )
;
nrs.sr_attrs = anlist;
nrs.sr_entry = &e;
@ -104,17 +116,7 @@ backsql_compare( Operation *op, SlapReply *rs )
goto return_results;
}
e.e_attrs = nrs.sr_operational_attrs;
} else {
rc = backsql_id2entry( &bsi, &bsi.bsi_base_id );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_compare(): "
"error %d in backsql_id2entry() "
"- compare failed\n", rc, 0, 0 );
rs->sr_err = rc;
goto return_results;
}
*ap = nrs.sr_operational_attrs;
}
if ( ! access_allowed( op, &e, op->oq_compare.rs_ava->aa_desc,

5
servers/slapd/back-sql/delete.c
View File

@ -123,9 +123,8 @@ backsql_delete( Operation *op, SlapReply *rs )
break;
case LDAP_REFERRAL:
if ( !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname )
&& manageDSAit )
if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname ) )
{
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;

5
servers/slapd/back-sql/modify.c
View File

@ -74,9 +74,8 @@ backsql_modify( Operation *op, SlapReply *rs )
break;
case LDAP_REFERRAL:
if ( !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname )
&& manageDSAit )
if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname ) )
{
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;

10
servers/slapd/back-sql/modrdn.c
View File

@ -83,9 +83,8 @@ backsql_modrdn( Operation *op, SlapReply *rs )
break;
case LDAP_REFERRAL:
if ( !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname )
&& manageDSAit )
if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname ) )
{
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;
@ -464,9 +463,8 @@ backsql_modrdn( Operation *op, SlapReply *rs )
break;
case LDAP_REFERRAL:
if ( !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &new_ndn, &bsi.bsi_e->e_nname )
&& manageDSAit )
if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &new_ndn, &bsi.bsi_e->e_nname ) )
{
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;

5
servers/slapd/back-sql/search.c
View File

@ -1845,9 +1845,8 @@ backsql_search( Operation *op, SlapReply *rs )
break;
case LDAP_REFERRAL:
if ( !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname )
&& manageDSAit )
if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname ) )
{
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;