X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbind.c;h=aa5c58af0a5d5a9d8e61d8cd3d3f8d19838418fe;hb=86bd3651e1bc6129cf2bd4ba271f33207843aaff;hp=f06652000d868260c87f720719983f587cacc7eb;hpb=fda3d6260e25f1d0b9c035b0d520b2c9d0f22e49;p=openldap
diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index f06652000d..aa5c58af0a 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -32,10 +32,6 @@
#include
#include "slap.h"
-#ifdef LDAP_SLAPI
-#include "slapi/slapi.h"
-#endif
-
int
do_bind(
@@ -183,7 +179,7 @@ do_bind(
"requested protocol version not supported" );
goto cleanup;
- } else if (!( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_V2 ) &&
+ } else if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
version < LDAP_VERSION3 )
{
send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
@@ -231,7 +227,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
struct berval mech = op->orb_tmp_mech;
/* check for inappropriate controls */
- if( get_manageDSAit( op ) == SLAP_CRITICAL_CONTROL ) {
+ if( get_manageDSAit( op ) == SLAP_CONTROL_CRITICAL ) {
send_ldap_error( op, rs,
LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
"manageDSAit control inappropriate" );
@@ -298,7 +294,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
}
if( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
- ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming_auth);
+ ber_len_t max = sockbuf_max_incoming_auth;
ber_sockbuf_ctrl( op->o_conn->c_sb,
LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
@@ -327,27 +323,6 @@ fe_op_bind( Operation *op, SlapReply *rs )
op->o_conn->c_sasl_bind_in_progress = 0;
}
-#ifdef LDAP_SLAPI
-#define pb op->o_pb
- /*
- * Normally post-operation plugins are called only after the
- * backend operation. Because the front-end performs SASL
- * binds on behalf of the backend, we'll make a special
- * exception to call the post-operation plugins after a
- * SASL bind.
- */
- if ( pb ) {
- slapi_int_pblock_set_operation( pb, op );
- slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)op->o_req_dn.bv_val );
- slapi_pblock_set( pb, SLAPI_BIND_METHOD, (void *)op->orb_method );
- slapi_pblock_set( pb,
- SLAPI_BIND_CREDENTIALS, (void *)&op->orb_cred );
- slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(0) );
- (void) slapi_int_call_plugins( op->o_bd,
- SLAPI_PLUGIN_POST_BIND_FN, pb );
- }
-#endif /* LDAP_SLAPI */
-
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
goto cleanup;
@@ -373,20 +348,20 @@ fe_op_bind( Operation *op, SlapReply *rs )
rs->sr_err = LDAP_SUCCESS;
if( !BER_BVISEMPTY( &op->orb_cred ) &&
- !( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_ANON_CRED ))
+ !( global_allows & SLAP_ALLOW_BIND_ANON_CRED ))
{
/* cred is not empty, disallow */
rs->sr_err = LDAP_INVALID_CREDENTIALS;
} else if ( !BER_BVISEMPTY( &op->o_req_ndn ) &&
- !( SLAPD_GLOBAL(allows) & SLAP_ALLOW_BIND_ANON_DN ))
+ !( global_allows & SLAP_ALLOW_BIND_ANON_DN ))
{
/* DN is not empty, disallow */
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
rs->sr_text =
"unauthenticated bind (DN with no password) disallowed";
- } else if ( SLAPD_GLOBAL(disallows) & SLAP_DISALLOW_BIND_ANON ) {
+ } else if ( global_disallows & SLAP_DISALLOW_BIND_ANON ) {
/* disallow */
rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
rs->sr_text = "anonymous bind disallowed";
@@ -404,7 +379,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
op->o_protocol, 0, 0 );
goto cleanup;
- } else if ( SLAPD_GLOBAL(disallows) & SLAP_DISALLOW_BIND_SIMPLE ) {
+ } else if ( global_disallows & SLAP_DISALLOW_BIND_SIMPLE ) {
/* disallow simple authentication */
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
rs->sr_text = "unwilling to perform simple authentication";
@@ -418,7 +393,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
} else if ( op->orb_method == LDAP_AUTH_KRBV41 ) {
- if ( SLAPD_GLOBAL(disallows) & SLAP_DISALLOW_BIND_KRBV4 ) {
+ if ( global_disallows & SLAP_DISALLOW_BIND_KRBV4 ) {
/* disallow krbv4 authentication */
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
rs->sr_text = "unwilling to perform Kerberos V4 bind";
@@ -449,7 +424,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
send_ldap_result( op, rs );
Debug( LDAP_DEBUG_TRACE,
- "do_bind: v%d unknown authentication method (%ld)\n",
+ "do_bind: v%d unknown authentication method (%d)\n",
op->o_protocol, op->orb_method, 0 );
goto cleanup;
}
@@ -464,7 +439,9 @@ fe_op_bind( Operation *op, SlapReply *rs )
/* don't return referral for bind requests */
/* noSuchObject is not allowed to be returned by bind */
rs->sr_err = LDAP_INVALID_CREDENTIALS;
+ op->o_bd = frontendDB;
send_ldap_result( op, rs );
+ op->o_bd = NULL;
goto cleanup;
}
@@ -474,85 +451,9 @@ fe_op_bind( Operation *op, SlapReply *rs )
goto cleanup;
}
-#ifdef LDAP_SLAPI
- if ( pb ) {
- int rc;
- slapi_int_pblock_set_operation( pb, op );
- slapi_pblock_set( pb, SLAPI_BIND_TARGET, (void *)op->o_req_dn.bv_val );
- slapi_pblock_set( pb, SLAPI_BIND_METHOD, (void *)op->orb_method );
- slapi_pblock_set( pb, SLAPI_BIND_CREDENTIALS, (void *)&op->orb_cred );
- slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(0) );
- slapi_pblock_set( pb, SLAPI_CONN_DN, (void *)(0) );
-
- rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_BIND_FN, pb );
-
- Debug(LDAP_DEBUG_TRACE,
- "do_bind: Bind preoperation plugin returned %d.\n",
- rs->sr_err, 0, 0);
-
- switch ( rc ) {
- case SLAPI_BIND_SUCCESS:
- /* Continue with backend processing */
- break;
- case SLAPI_BIND_FAIL:
- /* Failure, server sends result */
- rs->sr_err = LDAP_INVALID_CREDENTIALS;
- send_ldap_result( op, rs );
- goto cleanup;
- break;
- case SLAPI_BIND_ANONYMOUS:
- /* SLAPI_BIND_ANONYMOUS is undocumented XXX */
- default:
- /* Authoritative, plugin sent result, or no plugins called. */
- if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE,
- (void *)&rs->sr_err) != 0 )
- {
- rs->sr_err = LDAP_OTHER;
- }
-
- BER_BVZERO( &op->orb_edn );
-
- if ( rs->sr_err == LDAP_SUCCESS ) {
- slapi_pblock_get( pb, SLAPI_CONN_DN,
- (void *)&op->orb_edn.bv_val );
- if ( BER_BVISNULL( &op->orb_edn ) ) {
- if ( rc == 1 ) {
- /* No plugins were called; continue. */
- break;
- }
- } else {
- op->orb_edn.bv_len = strlen( op->orb_edn.bv_val );
- }
- rs->sr_err = dnPrettyNormal( NULL, &op->orb_edn,
- &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
- ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
- ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn);
- ber_dupbv(&op->o_conn->c_ndn, &op->o_req_ndn);
- op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
- BER_BVZERO( &op->o_req_dn );
- op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
- BER_BVZERO( &op->o_req_ndn );
- if ( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
- ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming_auth);
- ber_sockbuf_ctrl( op->o_conn->c_sb,
- LBER_SB_OPT_SET_MAX_INCOMING, &max );
- }
- /* log authorization identity */
- Statslog( LDAP_DEBUG_STATS,
- "%s BIND dn=\"%s\" mech=%s (SLAPI) ssf=0\n",
- op->o_log_prefix,
- BER_BVISNULL( &op->o_conn->c_dn )
- ? "" : op->o_conn->c_dn.bv_val,
- mech.bv_val, 0, 0 );
- ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
- }
- goto cleanup;
- break;
- }
- }
-#endif /* LDAP_SLAPI */
-
if( op->o_bd->be_bind ) {
+ op->o_conn->c_authz_cookie = NULL;
+
rs->sr_err = (op->o_bd->be_bind)( op, rs );
if ( rs->sr_err == 0 ) {
@@ -572,7 +473,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
ber_dupbv( &op->o_conn->c_ndn, &op->o_req_ndn );
if( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
- ber_len_t max = SLAPD_GLOBAL(sockbuf_max_incoming_auth);
+ ber_len_t max = sockbuf_max_incoming_auth;
ber_sockbuf_ctrl( op->o_conn->c_sb,
LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
@@ -594,6 +495,7 @@ fe_op_bind( Operation *op, SlapReply *rs )
} else if ( !BER_BVISNULL( &op->orb_edn ) ) {
free( op->orb_edn.bv_val );
+ BER_BVZERO( &op->orb_edn );
}
} else {
@@ -601,16 +503,6 @@ fe_op_bind( Operation *op, SlapReply *rs )
"operation not supported within naming context" );
}
-#ifdef LDAP_SLAPI
- if ( pb != NULL &&
- slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb ) < 0 )
- {
- Debug(LDAP_DEBUG_TRACE,
- "do_bind: Bind postoperation plugins failed.\n",
- 0, 0, 0);
- }
-#endif /* LDAP_SLAPI */
-
cleanup:;
return rs->sr_err;
}