X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fbind.c;h=dce317876a1ff38e561713b5a045f244f8f78f0c;hb=4a107089d82ecdaca788fc6ecdef34d3d4fc19df;hp=81192924fef9a26e6ff7291a9f2373a072d05fed;hpb=d0868eae95b318d9a60dd781af43c7a5fdf3d610;p=openldap

diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c
index 81192924fe..dce317876a 100644
--- a/servers/slapd/back-ldbm/bind.c
+++ b/servers/slapd/back-ldbm/bind.c
@@ -1,8 +1,17 @@
 /* bind.c - ldbm backend bind and unbind routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -36,12 +45,8 @@ ldbm_back_bind(
 
 	AttributeDescription *password = slap_schema.si_ad_userPassword;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG( BACK_LDBM, ENTRY, 
-		"ldbm_back_bind: dn: %s.\n", op->o_req_dn.bv_val, 0, 0 );
-#else
-	Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_bind: dn: %s\n", op->o_req_dn.bv_val, 0, 0);
-#endif
+	Debug(LDAP_DEBUG_ARGS,
+		"==> ldbm_back_bind: dn: %s\n", op->o_req_dn.bv_val, 0, 0);
 
 	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 ) );
@@ -55,146 +60,62 @@ ldbm_back_bind(
 	/* get entry with reader lock */
 	if ( (e = dn2entry_r( op->o_bd, &op->o_req_ndn, &matched )) == NULL ) {
 		if( matched != NULL ) {
-			rs->sr_matched = ch_strdup( matched->e_dn );
-
-			rs->sr_ref = is_entry_referral( matched )
-				? get_entry_referrals( op, matched )
-				: NULL;
-
 			cache_return_entry_r( &li->li_cache, matched );
-
-		} else {
-			rs->sr_ref = referral_rewrite( default_referral,
-				NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
 		}
-
 		ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
 
 		/* allow noauth binds */
 		rc = 1;
-		if ( rs->sr_ref != NULL ) {
-			rs->sr_err = LDAP_REFERRAL;
-		} else {
-			rs->sr_err = LDAP_INVALID_CREDENTIALS;
-		}
+		rs->sr_err = LDAP_INVALID_CREDENTIALS;
 		send_ldap_result( op, rs );
-
-		if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
-		if ( rs->sr_matched ) free( (char *)rs->sr_matched );
-#ifdef LDAP_SYNCREPL
 		return rs->sr_err;
-#else
-		return( rc );
-#endif
 	}
 
-	ber_dupbv( &op->oq_bind.rb_edn, &e->e_name );
-
 	/* check for deleted */
 #ifdef LDBM_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;
-		send_ldap_result( op, rs );
+		rc = LDAP_INVALID_CREDENTIALS;
 		goto return_results;
 	}
 #endif
 
 	if ( is_entry_alias( e ) ) {
 		/* entry is an alias, don't allow bind */
-#ifdef NEW_LOGGING
-		LDAP_LOG( BACK_LDBM, INFO, 
-			"ldbm_back_bind: entry (%s) is an alias.\n", e->e_name.bv_val, 0, 0 );
-#else
-		Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0,
-		    0, 0 );
-#endif
+		Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0, 0, 0 );
 
-
-		send_ldap_error( op, rs, LDAP_ALIAS_PROBLEM,
-		    "entry is alias" );
-
-#ifdef LDAP_SYNCREPL
-		rc = LDAP_ALIAS_PROBLEM;
+#if 1
+		rc = LDAP_INVALID_CREDENTIALS;
 #else
-		rc = 1;
+		rs->sr_text = "entry is alias";
+		rc = LDAP_ALIAS_PROBLEM;
 #endif
 		goto return_results;
 	}
 
 	if ( is_entry_referral( e ) ) {
 		/* entry is a referral, don't allow bind */
-		rs->sr_ref = get_entry_referrals( op, e );
-
-#ifdef NEW_LOGGING
-		LDAP_LOG( BACK_LDBM, INFO, 
-			   "ldbm_back_bind: entry(%s) is a referral.\n", e->e_dn, 0, 0 );
-#else
-		Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
-		    0, 0 );
-#endif
-
+		Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0, 0, 0 );
 
-		if( rs->sr_ref != NULL ) {
-			rs->sr_err = LDAP_REFERRAL;
-			rs->sr_matched = e->e_name.bv_val;
-
-		} else {
-			rs->sr_err = LDAP_INVALID_CREDENTIALS;
-		}
-		send_ldap_result( op, rs );
-
-		ber_bvarray_free( rs->sr_ref );
-
-#ifdef LDAP_SYNCREPL
-		rc = rs->sr_err;
-#else
-		rc = 1;
-#endif
+		rc = LDAP_INVALID_CREDENTIALS;
 		goto return_results;
 	}
 
 	switch ( op->oq_bind.rb_method ) {
 	case LDAP_AUTH_SIMPLE:
-		if ( ! access_allowed( op, e,
-			password, NULL, ACL_AUTH, NULL ) )
-		{
-			send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
-#ifdef LDAP_SYNCREPL
-			rc = LDAP_INSUFFICIENT_ACCESS;
-#else
-			rc = 1;
-#endif
-			goto return_results;
-		}
-
 		if ( (a = attr_find( e->e_attrs, password )) == NULL ) {
-			send_ldap_error( op, rs, LDAP_INAPPROPRIATE_AUTH, NULL );
-
 			/* stop front end from sending result */
-#ifdef LDAP_SYNCREPL
-			rc = LDAP_INAPPROPRIATE_AUTH;
-#else
-			rc = 1;
-#endif
+			rc = LDAP_INVALID_CREDENTIALS;
 			goto return_results;
 		}
 
-		if ( slap_passwd_check( op->o_conn, a, &op->oq_bind.rb_cred, &rs->sr_text ) != 0 ) {
-			send_ldap_error( op, rs, LDAP_INVALID_CREDENTIALS, NULL );
-			/* stop front end from sending result */
-#ifdef LDAP_SYNCREPL
+		if ( slap_passwd_check( op, e, a, &op->oq_bind.rb_cred,
+					&rs->sr_text ) != 0 )
+		{
+			/* failure; stop front end from sending result */
 			rc = LDAP_INVALID_CREDENTIALS;
-#else
-			rc = 1;
-#endif
 			goto return_results;
 		}
 
@@ -203,26 +124,17 @@ ldbm_back_bind(
 
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
 	case LDAP_AUTH_KRBV41:
-		if ( krbv4_ldap_auth( op->o_bd, &op->oq_bind.rb_cred, &ad ) != LDAP_SUCCESS ) {
-			send_ldap_error( op, rs, LDAP_INVALID_CREDENTIALS, NULL );
-#ifdef LDAP_SYNCREPL
+		if ( krbv4_ldap_auth( op->o_bd, &op->oq_bind.rb_cred, &ad )
+			!= LDAP_SUCCESS )
+		{
 			rc = LDAP_INVALID_CREDENTIALS;
-#else
-			rc = 1;
-#endif
 			goto return_results;
 		}
 
 		if ( ! access_allowed( op, e,
 			krbattr, NULL, ACL_AUTH, NULL ) )
 		{
-			send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
-				NULL );
-#ifdef LDAP_SYNCREPL
 			rc = LDAP_INSUFFICIENT_ACCESS;
-#else
-			rc = 1;
-#endif
 			goto return_results;
 		}
 
@@ -237,12 +149,7 @@ ldbm_back_bind(
 				rc = 0;
 				break;
 			}
-			send_ldap_error( op, rs, LDAP_INAPPROPRIATE_AUTH, NULL );
-#ifdef LDAP_SYNCREPL
 			rc = LDAP_INAPPROPRIATE_AUTH;
-#else
-			rc = 1;
-#endif
 			goto return_results;
 
 		} else {	/* look for krbname match */
@@ -252,43 +159,37 @@ ldbm_back_bind(
 			krbval.bv_len = strlen( krbname );
 
 			if ( value_find( a->a_desc, a->a_vals, &krbval ) != 0 ) {
-				send_ldap_error( op, rs,
-				    LDAP_INVALID_CREDENTIALS, NULL );
-#ifdef LDAP_SYNCREPL
 				rc = LDAP_INVALID_CREDENTIALS;
-#else
-				rc = 1;
-#endif
 				goto return_results;
 			}
 		}
 		rc = 0;
 		break;
-
-	case LDAP_AUTH_KRBV42:
-		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
-			"Kerberos bind step 2 not supported" );
-		/* stop front end from sending result */
-		rc = LDAP_UNWILLING_TO_PERFORM;
-		goto return_results;
 #endif
 
 	default:
-		send_ldap_error( op, rs, LDAP_STRONG_AUTH_NOT_SUPPORTED,
-		    "authentication method not supported" );
-#ifdef LDAP_SYNCREPL
+		assert( 0 ); /* should not be reachable */
+		rs->sr_text = "authentication method not supported";
 		rc = LDAP_STRONG_AUTH_NOT_SUPPORTED;
-#else
-		rc = 1;
-#endif
 		goto return_results;
 	}
 
+	ber_dupbv( &op->oq_bind.rb_edn, &e->e_name );
+
 return_results:;
 	/* free entry and reader lock */
 	cache_return_entry_r( &li->li_cache, e );
 	ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
 
+	if ( rc ) {
+		rs->sr_err = rc;
+		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 (rc==0) */
 	return( rc );
 }