X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-sql%2Fbind.c;h=f87ebdd972cc2d2b48ac938c5d9c4c754e742e2b;hb=5487575086d2060ab05a408543ff07be31b400a8;hp=96c06fdd1e735863194bc9df5cbe100c03e5e6a1;hpb=014ee81c340d03011ba92d940c7936294f6d12f4;p=openldap

diff --git a/servers/slapd/back-sql/bind.c b/servers/slapd/back-sql/bind.c
index 96c06fdd1e..f87ebdd972 100644
--- a/servers/slapd/back-sql/bind.c
+++ b/servers/slapd/back-sql/bind.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
  * Portions Copyright 2002 Pierangelo Masarati.
  * All rights reserved.
@@ -32,10 +32,9 @@ int
 backsql_bind( Operation *op, SlapReply *rs )
 {
 	SQLHDBC			dbh = SQL_NULL_HDBC;
-	Entry			*e = NULL,
-				user_entry = { 0 };
+	Entry			e = { 0 };
 	Attribute		*a;
-	backsql_srch_info	bsi;
+	backsql_srch_info	bsi = { 0 };
 	AttributeName		anlist[2];
 	int			rc;
  
@@ -45,7 +44,7 @@ backsql_bind( Operation *op, SlapReply *rs )
      		ber_dupbv( &op->oq_bind.rb_edn, be_root_dn( op->o_bd ) );
 		Debug( LDAP_DEBUG_TRACE, "<==backsql_bind() root bind\n", 
 				0, 0, 0 );
-		return 0;
+		return LDAP_SUCCESS;
 	}
 
 	ber_dupbv( &op->oq_bind.rb_edn, &op->o_req_ndn );
@@ -54,7 +53,7 @@ backsql_bind( Operation *op, SlapReply *rs )
 		rs->sr_err = LDAP_STRONG_AUTH_NOT_SUPPORTED;
 		rs->sr_text = "authentication method not supported"; 
 		send_ldap_result( op, rs );
-		return 1;
+		return rs->sr_err;
 	}
 
 	/*
@@ -68,45 +67,32 @@ backsql_bind( Operation *op, SlapReply *rs )
 
 		rs->sr_text = ( rs->sr_err == LDAP_OTHER )
 			? "SQL-backend error" : NULL;
-		send_ldap_result( op, rs );
-		return 1;
+		goto error_return;
 	}
 
 	anlist[0].an_name = slap_schema.si_ad_userPassword->ad_cname;
 	anlist[0].an_desc = slap_schema.si_ad_userPassword;
 	anlist[1].an_name.bv_val = NULL;
 
+	bsi.bsi_e = &e;
 	rc = backsql_init_search( &bsi, &op->o_req_ndn, LDAP_SCOPE_BASE, 
-			SLAP_NO_LIMIT, SLAP_NO_LIMIT,
 			(time_t)(-1), NULL, dbh, op, rs, anlist,
-			BACKSQL_ISF_GET_ID );
+			BACKSQL_ISF_GET_ENTRY );
 	if ( rc != LDAP_SUCCESS ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_bind(): "
 			"could not retrieve bindDN ID - no such entry\n", 
 			0, 0, 0 );
 		rs->sr_err = LDAP_INVALID_CREDENTIALS;
-		send_ldap_result( op, rs );
-		return 1;
-	}
-
-	bsi.bsi_e = &user_entry;
-	rc = backsql_id2entry( &bsi, &bsi.bsi_base_id );
-	if ( rc != LDAP_SUCCESS ) {
-		Debug( LDAP_DEBUG_TRACE, "backsql_bind(): "
-			"error %d in backsql_id2entry() "
-			"- auth failed\n", rc, 0, 0 );
-		rs->sr_err = LDAP_INVALID_CREDENTIALS;
 		goto error_return;
 	}
-	e = &user_entry;
 
-	a = attr_find( e->e_attrs, slap_schema.si_ad_userPassword );
+	a = attr_find( e.e_attrs, slap_schema.si_ad_userPassword );
 	if ( a == NULL ) {
 		rs->sr_err = LDAP_INVALID_CREDENTIALS;
 		goto error_return;
 	}
 
-	if ( slap_passwd_check( op, e, a, &op->oq_bind.rb_cred,
+	if ( slap_passwd_check( op, &e, a, &op->oq_bind.rb_cred,
 				&rs->sr_text ) != 0 )
 	{
 		rs->sr_err = LDAP_INVALID_CREDENTIALS;
@@ -115,24 +101,23 @@ backsql_bind( Operation *op, SlapReply *rs )
 
 error_return:;
 	if ( !BER_BVISNULL( &bsi.bsi_base_id.eid_ndn ) ) {
-		(void)backsql_free_entryID( &bsi.bsi_base_id, 0 );
+		(void)backsql_free_entryID( op, &bsi.bsi_base_id, 0 );
 	}
 
-	if ( e != NULL ) {
-		entry_clean( e );
+	if ( !BER_BVISNULL( &e.e_nname ) ) {
+		backsql_entry_clean( op, &e );
 	}
 
 	if ( bsi.bsi_attrs != NULL ) {
 		op->o_tmpfree( bsi.bsi_attrs, op->o_tmpmemctx );
 	}
 
-	if ( rs->sr_err ) {
+	if ( rs->sr_err != LDAP_SUCCESS ) {
 		send_ldap_result( op, rs );
-		return 1;
 	}
 	
-	Debug(LDAP_DEBUG_TRACE,"<==backsql_bind()\n",0,0,0);
+	Debug( LDAP_DEBUG_TRACE,"<==backsql_bind()\n", 0, 0, 0 );
 
-	return 0;
+	return rs->sr_err;
 }