/* op.c - relay backend operations */
+/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2004-2008 The OpenLDAP Foundation.
+ * Copyright 2004-2009 The OpenLDAP Foundation.
* Portions Copyright 2004 Pierangelo Masarati.
* All rights reserved.
*
#include "slap.h"
#include "back-relay.h"
-#define RB_ERR_MASK (0x00FFU)
-#define RB_ERR (0x1000U)
-#define RB_UNWILLING (0x2000U)
-#define RB_REFERRAL (0x4000U)
-#define RB_SEND (0x8000U)
-#define RB_UNWILLING_SEND (RB_UNWILLING|RB_SEND)
+#define RB_ERR_MASK (0x0000FFFFU)
+#define RB_ERR (0x10000000U)
+#define RB_UNSUPPORTED_FLAG (0x20000000U)
+#define RB_REFERRAL (0x40000000U)
+#define RB_SEND (0x80000000U)
+#define RB_UNSUPPORTED (LDAP_UNWILLING_TO_PERFORM|RB_ERR|RB_UNSUPPORTED_FLAG)
+#define RB_UNSUPPORTED_SEND (RB_UNSUPPORTED|RB_SEND)
#define RB_REFERRAL_SEND (RB_REFERRAL|RB_SEND)
+#define RB_ERR_SEND (RB_ERR|RB_SEND)
+#define RB_ERR_REFERRAL_SEND (RB_ERR|RB_REFERRAL|RB_SEND)
static int
relay_back_swap_bd( Operation *op, SlapReply *rs )
if ( bd == NULL && !BER_BVISNULL( &op->o_req_ndn ) ) {
bd = select_backend( &op->o_req_ndn, 1 );
- if ( bd == op->o_bd ) {
+ if ( bd->be_private == op->o_bd->be_private ) {
Debug( LDAP_DEBUG_ANY,
"%s: back-relay for DN=\"%s\" would call self.\n",
op->o_log_prefix, op->o_req_dn.bv_val, 0 );
- if ( fail_mode & RB_UNWILLING ) {
- rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
-
- } else if ( fail_mode & RB_ERR ) {
+ if ( fail_mode & RB_ERR ) {
rs->sr_err = rc;
- }
-
- if ( fail_mode & RB_SEND ) {
- send_ldap_result( op, rs );
+ if ( fail_mode & RB_SEND ) {
+ send_ldap_result( op, rs );
+ }
}
return NULL;
}
}
- if ( bd == NULL && fail_mode & RB_REFERRAL ) {
- if ( default_referral ) {
+ if ( bd == NULL ) {
+ if ( ( fail_mode & RB_REFERRAL )
+ && ( fail_mode & RB_SEND )
+ && !BER_BVISNULL( &op->o_req_ndn )
+ && default_referral )
+ {
rs->sr_err = LDAP_REFERRAL;
- if ( fail_mode & RB_SEND ) {
- rs->sr_ref = referral_rewrite(
- default_referral,
- NULL, &op->o_req_dn,
- LDAP_SCOPE_DEFAULT );
- if ( !rs->sr_ref ) {
- rs->sr_ref = default_referral;
- }
-
- send_ldap_result( op, rs );
- if ( rs->sr_ref != default_referral ) {
- ber_bvarray_free( rs->sr_ref );
- }
+ /* if we set sr_err to LDAP_REFERRAL,
+ * we must provide one */
+ rs->sr_ref = referral_rewrite(
+ default_referral,
+ NULL, &op->o_req_dn,
+ LDAP_SCOPE_DEFAULT );
+ if ( !rs->sr_ref ) {
+ rs->sr_ref = default_referral;
}
- } else {
- /* NOTE: err is LDAP_INVALID_CREDENTIALS for bind,
- * LDAP_NO_SUCH_OBJECT for other operations.
- * noSuchObject cannot be returned by bind */
- rs->sr_err = rc;
- if ( fail_mode & RB_SEND ) {
- send_ldap_result( op, rs );
+ send_ldap_result( op, rs );
+
+ if ( rs->sr_ref != default_referral ) {
+ ber_bvarray_free( rs->sr_ref );
}
+
+ return NULL;
+ }
+
+ /* NOTE: err is LDAP_INVALID_CREDENTIALS for bind,
+ * LDAP_NO_SUCH_OBJECT for other operations.
+ * noSuchObject cannot be returned by bind */
+ rs->sr_err = rc;
+ if ( fail_mode & RB_SEND ) {
+ send_ldap_result( op, rs );
}
}
op->o_callback = op->o_callback->sc_next;
}
- } else {
- if ( fail_mode & RB_ERR ) {
- rs->sr_err = rc;
-
- } else if ( fail_mode & RB_UNWILLING ) {
- rc = rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+ } else if ( fail_mode & RB_ERR ) {
+ rs->sr_err = rc;
+ if ( fail_mode & RB_UNSUPPORTED_FLAG ) {
rs->sr_text = "operation not supported within naming context";
}
}
bd = relay_back_select_backend( op, rs,
- ( LDAP_INVALID_CREDENTIALS | RB_ERR | RB_SEND ) );
+ ( LDAP_INVALID_CREDENTIALS | RB_ERR_SEND ) );
if ( bd == NULL ) {
return rs->sr_err;
}
return relay_back_op( op, rs, bd, bd->be_bind,
- ( LDAP_INVALID_CREDENTIALS | RB_ERR | RB_SEND ) );
+ ( LDAP_INVALID_CREDENTIALS | RB_ERR_SEND ) );
}
int
BackendDB *bd;
bd = relay_back_select_backend( op, rs,
- ( LDAP_NO_SUCH_OBJECT | RB_ERR | RB_SEND ) );
+ ( LDAP_NO_SUCH_OBJECT | RB_ERR_REFERRAL_SEND ) );
if ( bd == NULL ) {
return rs->sr_err;
}
return relay_back_op( op, rs, bd, bd->be_search,
- RB_UNWILLING_SEND );
+ RB_UNSUPPORTED_SEND );
}
int
BackendDB *bd;
bd = relay_back_select_backend( op, rs,
- ( LDAP_NO_SUCH_OBJECT | RB_ERR | RB_SEND ) );
+ ( LDAP_NO_SUCH_OBJECT | RB_ERR_REFERRAL_SEND ) );
if ( bd == NULL ) {
return rs->sr_err;
}
return relay_back_op( op, rs, bd, bd->be_compare,
- RB_UNWILLING_SEND );
+ ( SLAP_CB_CONTINUE | RB_ERR ) );
}
int
BackendDB *bd;
bd = relay_back_select_backend( op, rs,
- ( LDAP_NO_SUCH_OBJECT | RB_ERR | RB_SEND ) );
+ ( LDAP_NO_SUCH_OBJECT | RB_ERR_REFERRAL_SEND ) );
if ( bd == NULL ) {
return rs->sr_err;
}
return relay_back_op( op, rs, bd, bd->be_modify,
- RB_UNWILLING_SEND );
+ RB_UNSUPPORTED_SEND );
}
int
BackendDB *bd;
bd = relay_back_select_backend( op, rs,
- ( LDAP_NO_SUCH_OBJECT | RB_ERR | RB_SEND ) );
+ ( LDAP_NO_SUCH_OBJECT | RB_ERR_REFERRAL_SEND ) );
if ( bd == NULL ) {
return rs->sr_err;
}
return relay_back_op( op, rs, bd, bd->be_modrdn,
- RB_UNWILLING_SEND );
+ RB_UNSUPPORTED_SEND );
}
int
BackendDB *bd;
bd = relay_back_select_backend( op, rs,
- ( LDAP_NO_SUCH_OBJECT | RB_ERR | RB_SEND ) );
+ ( LDAP_NO_SUCH_OBJECT | RB_ERR_REFERRAL_SEND ) );
if ( bd == NULL ) {
return rs->sr_err;
}
return relay_back_op( op, rs, bd, bd->be_add,
- RB_UNWILLING_SEND );
+ RB_UNSUPPORTED_SEND );
}
int
BackendDB *bd;
bd = relay_back_select_backend( op, rs,
- ( LDAP_NO_SUCH_OBJECT | RB_ERR | RB_SEND ) );
+ ( LDAP_NO_SUCH_OBJECT | RB_ERR_REFERRAL_SEND ) );
if ( bd == NULL ) {
return rs->sr_err;
}
return relay_back_op( op, rs, bd, bd->be_delete,
- RB_UNWILLING_SEND );
+ RB_UNSUPPORTED_SEND );
}
int
BackendDB *bd;
bd = relay_back_select_backend( op, rs,
- ( LDAP_NO_SUCH_OBJECT | RB_ERR ) );
+ ( LDAP_NO_SUCH_OBJECT | RB_ERR | RB_REFERRAL ) );
if ( bd == NULL ) {
return rs->sr_err;
}
return relay_back_op( op, rs, bd, bd->be_extended,
- RB_UNWILLING );
+ RB_UNSUPPORTED );
}
int
BackendDB *bd;
bd = relay_back_select_backend( op, rs,
- ( LDAP_SUCCESS | RB_ERR | RB_SEND ) );
+ ( LDAP_SUCCESS | RB_ERR_REFERRAL_SEND ) );
/* FIXME: this test only works if there are no overlays, so
* it is nearly useless; if made stricter, no nested back-relays
* can be instantiated... too bad. */
}
}
- return relay_back_op( op, rs, bd, bd->be_chk_referrals, 0 );
+ return relay_back_op( op, rs, bd, bd->be_chk_referrals, LDAP_SUCCESS );
}
int
projects / openldap / blobdiff