drop stored procedures

[openldap] / servers / slapd / back-sql / bind.c

diff --git a/servers/slapd/back-sql/bind.c b/servers/slapd/back-sql/bind.c
index ed73fea3e3d7150618605324f7f4bcb9542df263..0bc12e5a24c7475f2dfdb53407c06f647258487d 100644 (file)
--- a/servers/slapd/back-sql/bind.c
+++ b/servers/slapd/back-sql/bind.c
@@ -1,8 +1,9 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
+ * Portions Copyright 2002 Pierangelo Masarati.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,31 +16,25 @@
  */
 /* ACKNOWLEDGEMENTS:
  * This work was initially developed by Dmitry Kovalev for inclusion
- * by OpenLDAP Software.
+ * by OpenLDAP Software.  Additional significant contributors include
+ * Pierangelo Masarati.
  */
 
 #include "portable.h"
 
-#ifdef SLAPD_SQL
-
 #include <stdio.h>
 #include <sys/types.h>
+
 #include "slap.h"
-#include "back-sql.h"
-#include "sql-wrap.h"
-#include "util.h"
-#include "entry-id.h"
+#include "proto-sql.h"
 
 int 
 backsql_bind( Operation *op, SlapReply *rs )
 {
-       backsql_info            *bi = (backsql_info*)op->o_bd->be_private;
-       backsql_entryID         user_id;
-       SQLHDBC                 dbh;
-       AttributeDescription    *password = slap_schema.si_ad_userPassword;
-       Entry                   *e, user_entry;
+       SQLHDBC                 dbh = SQL_NULL_HDBC;
+       Entry                   e = { 0 };
        Attribute               *a;
-       backsql_srch_info       bsi;
+       backsql_srch_info       bsi = { 0 };
        AttributeName           anlist[2];
        int                     rc;
  
@@ -49,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 );
@@ -58,70 +53,72 @@ 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;
        }
 
        /*
         * method = LDAP_AUTH_SIMPLE
         */
        rs->sr_err = backsql_get_db_conn( op, &dbh );
-       if (!dbh) {
+       if ( !dbh ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_bind(): "
                        "could not get connection handle - exiting\n",
                        0, 0, 0 );
 
                rs->sr_text = ( rs->sr_err == LDAP_OTHER )
                        ? "SQL-backend error" : NULL;
-               send_ldap_result( op, rs );
-               return 1;
+               goto error_return;
        }
 
-       rc = backsql_dn2id( bi, &user_id, dbh, &op->o_req_ndn );
+       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_ENTRY );
        if ( rc != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_bind(): "
-                       "could not retrieve bind dn id - no such entry\n", 
+                       "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;
+               goto error_return;
        }
 
-       anlist[0].an_name = password->ad_cname;
-       anlist[0].an_desc = password;
-       anlist[1].an_name.bv_val = NULL;
-       backsql_init_search( &bsi, &op->o_req_ndn, LDAP_SCOPE_BASE, 
-                       -1, -1, -1, NULL, dbh, op, anlist );
-       e = backsql_id2entry( &bsi, &user_entry, &user_id );
-       if ( e == NULL ) {
-               Debug( LDAP_DEBUG_TRACE, "backsql_bind(): "
-                       "error in backsql_id2entry() - auth failed\n",
-                       0, 0, 0 );
-               rs->sr_err = LDAP_OTHER;
-               send_ldap_result( op, rs );
-               return 1;
+       a = attr_find( e.e_attrs, slap_schema.si_ad_userPassword );
+       if ( a == NULL ) {
+               rs->sr_err = LDAP_INVALID_CREDENTIALS;
+               goto error_return;
        }
 
-       if ( ! access_allowed( op, e, password, NULL, ACL_AUTH, NULL ) ) {
-               rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
-               send_ldap_result( op, rs );
-               return 1;
+       if ( slap_passwd_check( op, &e, a, &op->oq_bind.rb_cred,
+                               &rs->sr_text ) != 0 )
+       {
+               rs->sr_err = LDAP_INVALID_CREDENTIALS;
+               goto error_return;
        }
 
-       if ( ( a = attr_find( e->e_attrs, password ) ) == NULL ) {
-               rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
-               send_ldap_result( op, rs );
-               return 1;
+error_return:;
+       if ( !BER_BVISNULL( &bsi.bsi_base_id.eid_ndn ) ) {
+               (void)backsql_free_entryID( op, &bsi.bsi_base_id, 0 );
        }
 
-       if ( slap_passwd_check( op->o_conn, a, &op->oq_bind.rb_cred, &rs->sr_text ) != 0 ) {
-               rs->sr_err = LDAP_INVALID_CREDENTIALS;
+       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 != 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;
 }
  
-#endif /* SLAPD_SQL */
-