/* bind.c - decode an ldap bind operation and pass it to a backend db */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
BerElement *ber = op->o_ber;
ber_int_t version;
ber_tag_t method;
- char *mech = NULL;
+ struct berval mech = { 0, NULL };
struct berval dn = { 0, NULL };
struct berval pdn = { 0, NULL };
struct berval ndn = { 0, NULL };
+ struct berval edn = { 0, NULL };
ber_tag_t tag;
int rc = LDAP_SUCCESS;
const char *text;
* }
*/
- tag = ber_scanf( ber, "{iot" /*}*/, &version, &dn, &method );
+ tag = ber_scanf( ber, "{imt" /*}*/, &version, &dn, &method );
if ( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
op->o_protocol = version;
if( method != LDAP_AUTH_SASL ) {
- tag = ber_scanf( ber, /*{*/ "o}", &cred );
+ tag = ber_scanf( ber, /*{*/ "m}", &cred );
} else {
- tag = ber_scanf( ber, "{a" /*}*/, &mech );
+ tag = ber_scanf( ber, "{o" /*}*/, &mech );
if ( tag != LBER_ERROR ) {
ber_len_t len;
tag = ber_peek_tag( ber, &len );
if ( tag == LDAP_TAG_LDAPCRED ) {
- tag = ber_scanf( ber, "o", &cred );
+ tag = ber_scanf( ber, "m", &cred );
} else {
tag = LDAP_TAG_LDAPCRED;
cred.bv_val = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_sasl_bind: conn %d dn (%s) mech %s\n", conn->c_connid,
- pdn.bv_val, mech ));
+ pdn.bv_val, mech.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
- pdn.bv_val, mech, NULL );
+ pdn.bv_val, mech.bv_val, NULL );
#endif
} else {
#endif
}
- Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
+ Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu BIND dn=\"%s\" method=%ld\n",
op->o_connid, op->o_opid, pdn.bv_val, (unsigned long) method, 0 );
if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
conn->c_protocol = version;
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+ /* check for inappropriate controls */
+ if( get_manageDSAit( op ) == SLAP_CRITICAL_CONTROL ) {
+ send_ldap_result( conn, op,
+ rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION,
+ NULL, "manageDSAit control inappropriate",
+ NULL, NULL );
+ goto cleanup;
+ }
+
if ( method == LDAP_AUTH_SASL ) {
- char *edn;
slap_ssf_t ssf = 0;
if ( version < LDAP_VERSION3 ) {
goto cleanup;
}
- if( mech == NULL || *mech == '\0' ) {
+ if( mech.bv_len == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d no SASL mechanism provided\n",
}
/* check restrictions */
- rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+ rc = backend_check_restrictions( NULL, conn, op, &mech, &text );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
if ( conn->c_sasl_bind_in_progress ) {
- if((strcmp(conn->c_sasl_bind_mech, mech) != 0)) {
+ if((ber_bvcmp(&conn->c_sasl_bind_mech, &mech) != 0)) {
/* mechanism changed between bind steps */
slap_sasl_reset(conn);
}
} else {
conn->c_sasl_bind_mech = mech;
- mech = NULL;
+ mech.bv_val = NULL;
+ mech.bv_len = 0;
}
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
- edn = NULL;
rc = slap_sasl_bind( conn, op,
&pdn, &ndn,
&cred, &edn, &ssf );
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
if( rc == LDAP_SUCCESS ) {
- conn->c_dn.bv_val = edn;
- if( edn != NULL ) {
- conn->c_dn.bv_len = strlen( edn );
- dnNormalize2( NULL, &conn->c_dn, &conn->c_ndn );
+ conn->c_dn = edn;
+ if( edn.bv_len != 0 ) {
+ /* edn is always normalized already */
+ ber_dupbv( &conn->c_ndn, &conn->c_dn );
}
conn->c_authmech = conn->c_sasl_bind_mech;
- conn->c_sasl_bind_mech = NULL;
+ conn->c_sasl_bind_mech.bv_val = NULL;
+ conn->c_sasl_bind_mech.bv_len = 0;
conn->c_sasl_bind_in_progress = 0;
conn->c_sasl_ssf = ssf;
conn->c_sasl_bind_in_progress = 1;
} else {
- if ( conn->c_sasl_bind_mech ) {
- free( conn->c_sasl_bind_mech );
- conn->c_sasl_bind_mech = NULL;
+ if ( conn->c_sasl_bind_mech.bv_val ) {
+ free( conn->c_sasl_bind_mech.bv_val );
+ conn->c_sasl_bind_mech.bv_val = NULL;
+ conn->c_sasl_bind_mech.bv_len = 0;
}
conn->c_sasl_bind_in_progress = 0;
}
/* Not SASL, cancel any in-progress bind */
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
- if ( conn->c_sasl_bind_mech != NULL ) {
- free(conn->c_sasl_bind_mech);
- conn->c_sasl_bind_mech = NULL;
+ if ( conn->c_sasl_bind_mech.bv_val != NULL ) {
+ free(conn->c_sasl_bind_mech.bv_val);
+ conn->c_sasl_bind_mech.bv_val = NULL;
+ conn->c_sasl_bind_mech.bv_len = 0;
}
conn->c_sasl_bind_in_progress = 0;
text = "anonymous bind disallowed";
} else {
- rc = backend_check_restrictions( NULL, conn, op, mech, &text );
+ rc = backend_check_restrictions( NULL, conn, op,
+ &mech, &text );
}
/*
if ( (be = select_backend( &ndn, 0, 0 )) == NULL ) {
if ( default_referral ) {
- struct berval **ref = referral_rewrite( default_referral,
+ BerVarray ref = referral_rewrite( default_referral,
NULL, &pdn, LDAP_SCOPE_DEFAULT );
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
NULL, NULL, ref ? ref : default_referral, NULL );
- ber_bvecfree( ref );
+ ber_bvarray_free( ref );
} else {
/* noSuchObject is not allowed to be returned by bind */
goto cleanup;
}
- conn->c_authz_backend = be;
-
if ( be->be_bind ) {
int ret;
- /* alias suffix */
- struct berval edn = { 0, NULL };
/* deref suffix alias if appropriate */
suffix_alias( be, &ndn );
if ( ret == 0 ) {
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+ if( conn->c_authz_backend == NULL ) {
+ conn->c_authz_backend = be;
+ }
+
if(edn.bv_len) {
conn->c_dn = edn;
} else {
- ber_dupbv( &conn->c_dn, &pdn );
+ conn->c_dn = pdn;
+ pdn.bv_val = NULL;
+ pdn.bv_len = 0;
}
- conn->c_cdn = pdn.bv_val;
- pdn.bv_val = NULL;
- pdn.bv_len = 0;
conn->c_ndn = ndn;
ndn.bv_val = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d v%d bind: \"%s\" to \"%s\" \n",
- conn->c_connid, version, conn->c_cdn, conn->c_dn.bv_val ));
+ conn->c_connid, version, dn.bv_val, conn->c_dn.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d bind: \"%s\" to \"%s\"\n",
- version, conn->c_cdn, conn->c_dn.bv_val );
+ version, dn.bv_val, conn->c_dn.bv_val );
#endif
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
}
cleanup:
- free( dn.bv_val );
if( pdn.bv_val != NULL ) {
free( pdn.bv_val );
}
if( ndn.bv_val != NULL ) {
free( ndn.bv_val );
}
- if ( mech != NULL ) {
- free( mech );
- }
- if ( cred.bv_val != NULL ) {
- free( cred.bv_val );
+ if ( mech.bv_val != NULL ) {
+ free( mech.bv_val );
}
return rc;