X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fbind.c;h=9739773aea7470bf4e1e9f699df50363b598a1aa;hb=82c1b0d1f0a27e374961c910473f549878e81e24;hp=04be2e37e4c6d312f20e1349e9ded54d930c3343;hpb=21cecb3831e5caa7f9ad5a00e1167a87df81e8b2;p=openldap
diff --git a/servers/slapd/back-bdb/bind.c b/servers/slapd/back-bdb/bind.c
index 04be2e37e4..9739773aea 100644
--- a/servers/slapd/back-bdb/bind.c
+++ b/servers/slapd/back-bdb/bind.c
@@ -1,8 +1,17 @@
/* bind.c - bdb backend bind routine */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -16,233 +25,232 @@
#include "external.h"
int
-bdb_bind(
- Backend *be,
- Connection *conn,
- Operation *op,
- struct berval *dn,
- struct berval *ndn,
- int method,
- struct berval *cred,
- struct berval *edn
-)
+bdb_bind( Operation *op, SlapReply *rs )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
Entry *e;
Attribute *a;
- int rc;
- Entry *matched;
+ EntryInfo *ei;
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
char krbname[MAX_K_NAME_SZ + 1];
AttributeDescription *krbattr = slap_schema.si_ad_krbName;
+ struct berval krbval;
AUTH_DAT ad;
#endif
AttributeDescription *password = slap_schema.si_ad_userPassword;
- Debug( LDAP_DEBUG_ARGS, "==> bdb_bind: dn: %s\n", dn->bv_val, 0, 0);
+ u_int32_t locker;
+ DB_LOCK lock;
- /* get entry */
- rc = bdb_dn2entry( be, NULL, ndn->bv_val, &e, &matched, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ARGS,
+ "==> bdb_bind: dn: %s\n", op->o_req_dn.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ARGS,
+ "==> bdb_bind: dn: %s\n", op->o_req_dn.bv_val, 0, 0);
+#endif
- switch(rc) {
- case DB_NOTFOUND:
+ /* allow noauth binds */
+ if ( op->oq_bind.rb_method == LDAP_AUTH_SIMPLE && be_isroot_pw( op )) {
+ ber_dupbv( &op->oq_bind.rb_edn, be_root_dn( op->o_bd ) );
+ /* front end will send result */
+ return LDAP_SUCCESS;
+ }
+
+ rs->sr_err = LOCK_ID(bdb->bi_dbenv, &locker);
+ switch(rs->sr_err) {
case 0:
break;
default:
- send_ldap_result( conn, op, rc=LDAP_OTHER,
- NULL, "internal error", NULL, NULL );
- return rc;
+ rs->sr_text = "internal error";
+ send_ldap_result( op, rs );
+ return rs->sr_err;
}
+dn2entry_retry:
/* get entry with reader lock */
- if ( e == NULL ) {
- char *matched_dn = NULL;
- struct berval **refs;
+ rs->sr_err = bdb_dn2entry( op, NULL, &op->o_req_ndn, &ei, 1,
+ locker, &lock );
- if( matched != NULL ) {
- matched_dn = ch_strdup( matched->e_dn );
-
- refs = is_entry_referral( matched )
- ? get_entry_referrals( be, conn, op, matched )
- : NULL;
-
- bdb_entry_return( be, matched );
- matched = NULL;
+ switch(rs->sr_err) {
+ case DB_NOTFOUND:
+ case 0:
+ break;
+ case LDAP_BUSY:
+ send_ldap_error( op, rs, LDAP_BUSY, "ldap_server_busy" );
+ LOCK_ID_FREE(bdb->bi_dbenv, locker);
+ return LDAP_BUSY;
+ case DB_LOCK_DEADLOCK:
+ case DB_LOCK_NOTGRANTED:
+ goto dn2entry_retry;
+ default:
+ send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
+ LOCK_ID_FREE(bdb->bi_dbenv, locker);
+ return rs->sr_err;
+ }
- } else {
- refs = referral_rewrite( default_referral,
- NULL, dn, LDAP_SCOPE_DEFAULT );
+ e = ei->bei_e;
+ if ( rs->sr_err == DB_NOTFOUND ) {
+ if( e != NULL ) {
+ bdb_cache_return_entry_r( bdb->bi_dbenv,
+ &bdb->bi_cache, e, &lock );
+ e = NULL;
}
- /* allow noauth binds */
- rc = 1;
- if ( method == LDAP_AUTH_SIMPLE ) {
- if ( be_isroot_pw( be, conn, ndn, cred ) ) {
- ber_dupbv( edn, be_root_dn( be ) );
- rc = LDAP_SUCCESS; /* front end will send result */
-
- } else if ( refs != NULL ) {
- send_ldap_result( conn, op, rc = LDAP_REFERRAL,
- matched_dn, NULL, refs, NULL );
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
+ send_ldap_result( op, rs );
- } else {
- send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS,
- NULL, NULL, NULL, NULL );
- }
+ LOCK_ID_FREE(bdb->bi_dbenv, locker);
- } else if ( refs != NULL ) {
- send_ldap_result( conn, op, rc = LDAP_REFERRAL,
- matched_dn, NULL, refs, NULL );
-
- } else {
- send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS,
- NULL, NULL, NULL, NULL );
- }
-
- ber_bvecfree( refs );
- free( matched_dn );
-
- return rc;
+ return rs->sr_err;
}
- ber_dupbv( edn, &e->e_name );
+ ber_dupbv( &op->oq_bind.rb_edn, &e->e_name );
/* check for deleted */
+#ifdef BDB_SUBENTRIES
+ if ( is_entry_subentry( e ) ) {
+ /* entry is an subentry, don't allow bind */
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_bind: entry is subentry\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "entry is subentry\n", 0,
+ 0, 0 );
+#endif
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
+ goto done;
+ }
+#endif
+#ifdef BDB_ALIASES
if ( is_entry_alias( e ) ) {
/* entry is an alias, don't allow bind */
- Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0,
- 0, 0 );
-
- send_ldap_result( conn, op, rc = LDAP_ALIAS_PROBLEM,
- NULL, "entry is alias", NULL, NULL );
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_bind: entry is alias\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0, 0, 0 );
+#endif
+#if 1
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
+#else
+ rs->sr_err = LDAP_ALIAS_PROBLEM;
+ rs->sr_text = "entry is alias";
+#endif
goto done;
}
+#endif
if ( is_entry_referral( e ) ) {
- /* entry is a referral, don't allow bind */
- struct berval **refs = get_entry_referrals( be,
- conn, op, e );
-
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_bind: entry is referral\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );
-
- if( refs != NULL ) {
- send_ldap_result( conn, op, rc = LDAP_REFERRAL,
- e->e_dn, NULL, refs, NULL );
-
- } else {
- send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS,
- NULL, NULL, NULL, NULL );
- }
-
- ber_bvecfree( refs );
-
+#endif
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
goto done;
}
- switch ( method ) {
+ switch ( op->oq_bind.rb_method ) {
case LDAP_AUTH_SIMPLE:
- /* check for root dn/passwd */
- if ( be_isroot_pw( be, conn, ndn, cred ) ) {
- /* front end will send result */
- if(edn->bv_val != NULL) free( edn->bv_val );
- ber_dupbv( edn, be_root_dn( be ) );
- rc = LDAP_SUCCESS;
- goto done;
- }
-
- if ( ! access_allowed( be, conn, op, e,
- password, NULL, ACL_AUTH ) )
- {
- send_ldap_result( conn, op, rc = LDAP_INSUFFICIENT_ACCESS,
- NULL, NULL, NULL, NULL );
+ rs->sr_err = access_allowed( op, e,
+ password, NULL, ACL_AUTH, NULL );
+ if ( ! rs->sr_err ) {
+#if 1
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
+#else
+ rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+#endif
goto done;
}
if ( (a = attr_find( e->e_attrs, password )) == NULL ) {
- send_ldap_result( conn, op, rc = LDAP_INAPPROPRIATE_AUTH,
- NULL, NULL, NULL, NULL );
+#if 1
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
+#else
+ rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
+#endif
goto done;
}
- if ( slap_passwd_check( conn, a, cred ) != 0 ) {
- send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS,
- NULL, NULL, NULL, NULL );
+ if ( slap_passwd_check( op->o_conn,
+ a, &op->oq_bind.rb_cred, &rs->sr_text ) != 0 )
+ {
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
goto done;
}
- rc = 0;
+ rs->sr_err = 0;
break;
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
case LDAP_AUTH_KRBV41:
- if ( krbv4_ldap_auth( be, cred, &ad ) != LDAP_SUCCESS ) {
- send_ldap_result( conn, op, rc = LDAP_INVALID_CREDENTIALS,
- NULL, NULL, NULL, NULL );
+ if ( krbv4_ldap_auth( op->o_bd, &op->oq_bind.rb_cred, &ad )
+ != LDAP_SUCCESS )
+ {
+ rs->sr_err = LDAP_INVALID_CREDENTIALS,
goto done;
}
- if ( ! access_allowed( be, conn, op, e,
- krbattr, NULL, ACL_AUTH ) )
- {
- send_ldap_result( conn, op, rc = LDAP_INSUFFICIENT_ACCESS,
- NULL, NULL, NULL, NULL );
+ rs->sr_err = access_allowed( op, e,
+ krbattr, NULL, ACL_AUTH, NULL );
+ if ( ! rs->sr_err ) {
+ rs->sr_err = LDAP_INSUFFICIENT_ACCESS,
goto done;
}
- sprintf( krbname, "%s%s%s@%s", ad.pname, *ad.pinst ? "."
- : "", ad.pinst, ad.prealm );
+ krbval.bv_len = sprintf( krbname, "%s%s%s@%s", ad.pname,
+ *ad.pinst ? "." : "", ad.pinst, ad.prealm );
if ( (a = attr_find( e->e_attrs, krbattr )) == NULL ) {
/*
* no krbname values present: check against DN
*/
- if ( strcasecmp( dn, krbname ) == 0 ) {
- rc = 0;
+ if ( strcasecmp( op->o_req_dn.bv_val, krbname ) == 0 ) {
+ rs->sr_err = 0;
break;
}
- send_ldap_result( conn, op, rc = LDAP_INAPPROPRIATE_AUTH,
- NULL, NULL, NULL, NULL );
+ rs->sr_err = LDAP_INAPPROPRIATE_AUTH,
goto done;
} else { /* look for krbname match */
- struct berval krbval;
-
krbval.bv_val = krbname;
- krbval.bv_len = strlen( krbname );
if ( value_find( a->a_desc, a->a_vals, &krbval ) != 0 ) {
- send_ldap_result( conn, op,
- rc = LDAP_INVALID_CREDENTIALS,
- NULL, NULL, NULL, NULL );
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
goto done;
}
}
- rc = 0;
+ rs->sr_err = 0;
break;
-
- case LDAP_AUTH_KRBV42:
- send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "Kerberos bind step 2 not supported",
- NULL, NULL );
- goto done;
#endif
default:
- send_ldap_result( conn, op, rc = LDAP_STRONG_AUTH_NOT_SUPPORTED,
- NULL, "authentication method not supported", NULL, NULL );
- goto done;
+ assert( 0 ); /* should not be unreachable */
+ rs->sr_err = LDAP_STRONG_AUTH_NOT_SUPPORTED;
+ rs->sr_text = "authentication method not supported";
}
done:
/* free entry and reader lock */
if( e != NULL ) {
- bdb_entry_return( be, e );
+ bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
}
- /* front end with send result on success (rc==0) */
- return rc;
+ LOCK_ID_FREE(bdb->bi_dbenv, locker);
+
+ if ( rs->sr_err ) {
+ send_ldap_result( op, rs );
+ if ( rs->sr_ref ) {
+ ber_bvarray_free( rs->sr_ref );
+ rs->sr_ref = NULL;
+ }
+ }
+ /* front end will send result on success (rs->sr_err==0) */
+ return rs->sr_err;
}