add extra level of parens only if required

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

diff --git a/servers/slapd/back-sql/bind.c b/servers/slapd/back-sql/bind.c
index 20c566ed7f576276076d7f0062cbea439afe5c12..ed73fea3e3d7150618605324f7f4bcb9542df263 100644 (file)
--- a/servers/slapd/back-sql/bind.c
+++ b/servers/slapd/back-sql/bind.c
@@ -1,10 +1,21 @@
-/*
- *      Copyright 1999, Dmitry Kovalev <mit@openldap.org>, All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *      Redistribution and use in source and binary forms are permitted only
- *      as authorized by the OpenLDAP Public License.  A copy of this
- *      license is available at http://www.OpenLDAP.org/license.html or
- *      in file LICENSE in the top-level directory of the distribution.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 1999 Dmitry Kovalev.
+ * 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>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Dmitry Kovalev for inclusion
+ * by OpenLDAP Software.
  */
 
 #include "portable.h"
@@ -16,23 +27,101 @@
 #include "slap.h"
 #include "back-sql.h"
 #include "sql-wrap.h"
+#include "util.h"
+#include "entry-id.h"
 
-int backsql_bind(BackendDB *be,Connection *conn,Operation *op,
-       const char *dn,const char *ndn,int method,struct berval *cred,char** edn)
+int 
+backsql_bind( Operation *op, SlapReply *rs )
 {
- Debug(LDAP_DEBUG_TRACE,"==>backsql_bind()\n",0,0,0);
- //for now, just return OK, allowing to test modify operations
- send_ldap_result(conn,op,LDAP_SUCCESS,NULL,NULL,NULL,0);
- Debug(LDAP_DEBUG_TRACE,"<==backsql_bind()\n",0,0,0);
- return 0;
-}
+       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;
+       Attribute               *a;
+       backsql_srch_info       bsi;
+       AttributeName           anlist[2];
+       int                     rc;
  
-int backsql_unbind(BackendDB *be,Connection *conn,Operation *op)
-{
- Debug(LDAP_DEBUG_TRACE,"==>backsql_unbind()\n",0,0,0);
- send_ldap_result(conn,op,LDAP_SUCCESS,NULL,NULL,NULL,0);
- Debug(LDAP_DEBUG_TRACE,"<==backsql_unbind()\n",0,0,0);
- return 0;
-}
+       Debug( LDAP_DEBUG_TRACE, "==>backsql_bind()\n", 0, 0, 0 );
+
+       if ( be_isroot_pw( op ) ) {
+               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;
+       }
+
+       ber_dupbv( &op->oq_bind.rb_edn, &op->o_req_ndn );
+
+       if ( op->oq_bind.rb_method != LDAP_AUTH_SIMPLE ) {
+               rs->sr_err = LDAP_STRONG_AUTH_NOT_SUPPORTED;
+               rs->sr_text = "authentication method not supported"; 
+               send_ldap_result( op, rs );
+               return 1;
+       }
+
+       /*
+        * method = LDAP_AUTH_SIMPLE
+        */
+       rs->sr_err = backsql_get_db_conn( op, &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;
+       }
+
+       rc = backsql_dn2id( bi, &user_id, dbh, &op->o_req_ndn );
+       if ( rc != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_TRACE, "backsql_bind(): "
+                       "could not retrieve bind dn id - no such entry\n", 
+                       0, 0, 0 );
+               rs->sr_err = LDAP_INVALID_CREDENTIALS;
+               send_ldap_result( op, rs );
+               return 1;
+       }
+
+       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;
+       }
+
+       if ( ! access_allowed( op, e, password, NULL, ACL_AUTH, NULL ) ) {
+               rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+               send_ldap_result( op, rs );
+               return 1;
+       }
+
+       if ( ( a = attr_find( e->e_attrs, password ) ) == NULL ) {
+               rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
+               send_ldap_result( op, rs );
+               return 1;
+       }
+
+       if ( slap_passwd_check( op->o_conn, a, &op->oq_bind.rb_cred, &rs->sr_text ) != 0 ) {
+               rs->sr_err = LDAP_INVALID_CREDENTIALS;
+               send_ldap_result( op, rs );
+               return 1;
+       }
+
+       Debug(LDAP_DEBUG_TRACE,"<==backsql_bind()\n",0,0,0);
+       return 0;
+}
+ 
 #endif /* SLAPD_SQL */
+