]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldbm/bind.c
Notices and acknowledgements
[openldap] / servers / slapd / back-ldbm / bind.c
index 766e31c0c693bcfbb1d56c3a8de190acddcd8ff4..e84935af0ec5ec862a4916005852377a9e7ea399 100644 (file)
@@ -1,7 +1,7 @@
 /* bind.c - ldbm backend bind and unbind routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 
 int
 ldbm_back_bind(
-    Backend            *be,
-    Connection         *conn,
     Operation          *op,
-    struct berval      *dn,
-    struct berval      *ndn,
-    int                        method,
-    struct berval      *cred,
-    struct berval      *edn
-)
+    SlapReply          *rs )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+       struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
        Entry           *e;
        Attribute       *a;
        int             rc;
@@ -45,93 +38,95 @@ ldbm_back_bind(
 
 #ifdef NEW_LOGGING
        LDAP_LOG( BACK_LDBM, ENTRY, 
-               "ldbm_back_bind: dn: %s.\n", dn->bv_val, 0, 0 );
+               "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", dn->bv_val, 0, 0);
+       Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_bind: dn: %s\n", op->o_req_dn.bv_val, 0, 0);
 #endif
 
-       dn = ndn;
+       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;
+       }
 
        /* grab giant lock for reading */
        ldap_pvt_thread_rdwr_rlock(&li->li_giant_rwlock);
 
        /* get entry with reader lock */
-       if ( (e = dn2entry_r( be, dn, &matched )) == NULL ) {
-               char *matched_dn = NULL;
-               BerVarray refs = NULL;
-
+       if ( (e = dn2entry_r( op->o_bd, &op->o_req_ndn, &matched )) == NULL ) {
                if( matched != NULL ) {
-                       matched_dn = ch_strdup( matched->e_dn );
+                       rs->sr_matched = ch_strdup( matched->e_dn );
 
-                       refs = is_entry_referral( matched )
-                               ? get_entry_referrals( be, conn, op, matched )
+                       rs->sr_ref = is_entry_referral( matched )
+                               ? get_entry_referrals( op, matched )
                                : NULL;
 
                        cache_return_entry_r( &li->li_cache, matched );
 
                } else {
-                       refs = referral_rewrite( default_referral,
-                               NULL, dn, LDAP_SCOPE_DEFAULT );
+                       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 ( method == LDAP_AUTH_SIMPLE ) {
-                       if ( be_isroot_pw( be, conn, dn, cred ) ) {
-                               ber_dupbv( edn, be_root_dn( be ) );
-                               rc = 0; /* front end will send result */
-
-                       } else if ( refs != NULL ) {
-                               send_ldap_result( conn, op, LDAP_REFERRAL,
-                                       matched_dn, NULL, refs, NULL );
-
-                       } else {
-                               send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-                                       NULL, NULL, NULL, NULL );
-                       }
-
-               } else if ( refs != NULL ) {
-                       send_ldap_result( conn, op, LDAP_REFERRAL,
-                               matched_dn, NULL, refs, NULL );
-
+               if ( rs->sr_ref != NULL ) {
+                       rs->sr_err = LDAP_REFERRAL;
                } else {
-                       send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-                               NULL, NULL, NULL, NULL );
+                       rs->sr_err = LDAP_INVALID_CREDENTIALS;
                }
+               send_ldap_result( op, rs );
 
-               if ( refs ) ber_bvarray_free( refs );
-               if ( matched_dn ) free( matched_dn );
-               return( rc );
+               if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+               if ( rs->sr_matched ) free( (char *)rs->sr_matched );
+               rs->sr_ref = NULL;
+               rs->sr_matched = NULL;
+               return rs->sr_err;
        }
 
-       ber_dupbv( edn, &e->e_name );
+       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_dn, 0, 0 );
+                       "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
 
 
-               send_ldap_result( conn, op, LDAP_ALIAS_PROBLEM,
-                   NULL, "entry is alias", NULL, NULL );
+               send_ldap_error( op, rs, LDAP_ALIAS_PROBLEM,
+                   "entry is alias" );
 
-               rc = 1;
+               rc = LDAP_ALIAS_PROBLEM;
                goto return_results;
        }
 
        if ( is_entry_referral( e ) ) {
                /* entry is a referral, don't allow bind */
-               BerVarray refs = get_entry_referrals( be,
-                       conn, op, e );
+               rs->sr_ref = get_entry_referrals( op, e );
 
 #ifdef NEW_LOGGING
                LDAP_LOG( BACK_LDBM, INFO, 
@@ -142,55 +137,44 @@ ldbm_back_bind(
 #endif
 
 
-               if( refs != NULL ) {
-                       send_ldap_result( conn, op, LDAP_REFERRAL,
-                               e->e_dn, NULL, refs, NULL );
+               if( rs->sr_ref != NULL ) {
+                       rs->sr_err = LDAP_REFERRAL;
+                       rs->sr_matched = e->e_name.bv_val;
 
                } else {
-                       send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-                               NULL, NULL, NULL, NULL );
+                       rs->sr_err = LDAP_INVALID_CREDENTIALS;
                }
+               send_ldap_result( op, rs );
 
-               ber_bvarray_free( refs );
-
-               rc = 1;
+               ber_bvarray_free( rs->sr_ref );
+               rs->sr_matched = NULL;
+               rs->sr_ref = NULL;
+               rc = rs->sr_err;
                goto return_results;
        }
 
-       switch ( method ) {
+       switch ( op->oq_bind.rb_method ) {
        case LDAP_AUTH_SIMPLE:
-               /* check for root dn/passwd */
-               if ( be_isroot_pw( be, conn, dn, cred ) ) {
-                       /* front end will send result */
-                       if(edn->bv_val != NULL) free( edn->bv_val );
-                       ber_dupbv( edn, be_root_dn( be ) );
-                       rc = 0;
-                       goto return_results;
-               }
-
-               if ( ! access_allowed( be, conn, op, e,
+               if ( ! access_allowed( op, e,
                        password, NULL, ACL_AUTH, NULL ) )
                {
-                       send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-                               NULL, NULL, NULL, NULL );
-                       rc = 1;
+                       send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
+                       rc = LDAP_INSUFFICIENT_ACCESS;
                        goto return_results;
                }
 
                if ( (a = attr_find( e->e_attrs, password )) == NULL ) {
-                       send_ldap_result( conn, op, LDAP_INAPPROPRIATE_AUTH,
-                           NULL, NULL, NULL, NULL );
+                       send_ldap_error( op, rs, LDAP_INAPPROPRIATE_AUTH, NULL );
 
                        /* stop front end from sending result */
-                       rc = 1;
+                       rc = LDAP_INAPPROPRIATE_AUTH;
                        goto return_results;
                }
 
-               if ( slap_passwd_check( conn, a, cred ) != 0 ) {
-                       send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
-                               NULL, NULL, NULL, NULL );
+               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 */
-                       rc = 1;
+                       rc = LDAP_INVALID_CREDENTIALS;
                        goto return_results;
                }
 
@@ -199,19 +183,18 @@ ldbm_back_bind(
 
 #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, LDAP_INVALID_CREDENTIALS,
-                           NULL, NULL, NULL, NULL );
-                       rc = 1;
+               if ( krbv4_ldap_auth( op->o_bd, &op->oq_bind.rb_cred, &ad ) != LDAP_SUCCESS ) {
+                       send_ldap_error( op, rs, LDAP_INVALID_CREDENTIALS, NULL );
+                       rc = LDAP_INVALID_CREDENTIALS;
                        goto return_results;
                }
 
-               if ( ! access_allowed( be, conn, op, e,
+               if ( ! access_allowed( op, e,
                        krbattr, NULL, ACL_AUTH, NULL ) )
                {
-                       send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-                               NULL, NULL, NULL, NULL );
-                       rc = 1;
+                       send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+                               NULL );
+                       rc = LDAP_INSUFFICIENT_ACCESS;
                        goto return_results;
                }
 
@@ -222,13 +205,12 @@ ldbm_back_bind(
                        /*
                         * no krbname values present:  check against DN
                         */
-                       if ( strcasecmp( dn->bv_val, krbname ) == 0 ) {
+                       if ( strcasecmp( op->o_req_dn.bv_val, krbname ) == 0 ) {
                                rc = 0;
                                break;
                        }
-                       send_ldap_result( conn, op, LDAP_INAPPROPRIATE_AUTH,
-                           NULL, NULL, NULL, NULL );
-                       rc = 1;
+                       send_ldap_error( op, rs, LDAP_INAPPROPRIATE_AUTH, NULL );
+                       rc = LDAP_INAPPROPRIATE_AUTH;
                        goto return_results;
 
                } else {        /* look for krbname match */
@@ -238,10 +220,9 @@ ldbm_back_bind(
                        krbval.bv_len = strlen( krbname );
 
                        if ( value_find( a->a_desc, a->a_vals, &krbval ) != 0 ) {
-                               send_ldap_result( conn, op,
-                                   LDAP_INVALID_CREDENTIALS,
-                                       NULL, NULL, NULL, NULL );
-                               rc = 1;
+                               send_ldap_error( op, rs,
+                                   LDAP_INVALID_CREDENTIALS, NULL );
+                               rc = LDAP_INVALID_CREDENTIALS;
                                goto return_results;
                        }
                }
@@ -249,18 +230,17 @@ ldbm_back_bind(
                break;
 
        case LDAP_AUTH_KRBV42:
-               send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "Kerberos bind step 2 not supported",
-                       NULL, NULL );
+               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_result( conn, op, LDAP_STRONG_AUTH_NOT_SUPPORTED,
-                   NULL, "authentication method not supported", NULL, NULL );
-               rc = 1;
+               send_ldap_error( op, rs, LDAP_STRONG_AUTH_NOT_SUPPORTED,
+                   "authentication method not supported" );
+               rc = LDAP_STRONG_AUTH_NOT_SUPPORTED;
                goto return_results;
        }
 
@@ -269,7 +249,7 @@ return_results:;
        cache_return_entry_r( &li->li_cache, e );
        ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
 
-       /* front end with send result on success (rc==0) */
+       /* front end will send result on success (rc==0) */
        return( rc );
 }