error message from be_entry_put tool backend function

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

diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c
index 449fac2ee11bd400a25cd357a9a1cceb4cabd10c..1eda1d2b36ab6613bf8459fd7264a258032ba243 100644 (file)
--- a/servers/slapd/back-ldbm/bind.c
+++ b/servers/slapd/back-ldbm/bind.c
@@ -1,7 +1,7 @@
 /* bind.c - ldbm backend bind and unbind routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -23,11 +23,11 @@ ldbm_back_bind(
     Backend            *be,
     Connection         *conn,
     Operation          *op,
-    const char         *dn,
-    const char         *ndn,
+    struct berval      *dn,
+    struct berval      *ndn,
     int                        method,
     struct berval      *cred,
-       char**  edn
+    struct berval      *edn
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
@@ -37,20 +37,26 @@ ldbm_back_bind(
        Entry           *matched;
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
        char            krbname[MAX_K_NAME_SZ + 1];
+       AttributeDescription *krbattr = slap_schema.si_ad_krbName;
        AUTH_DAT        ad;
 #endif
 
        AttributeDescription *password = slap_schema.si_ad_userPassword;
 
-       Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_bind: dn: %s\n", dn, 0, 0);
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+               "ldbm_back_bind: dn: %s.\n", dn->bv_val ));
+#else
+       Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_bind: dn: %s\n", dn->bv_val, 0, 0);
+#endif
+
 
-       *edn = NULL;
        dn = ndn;
 
        /* get entry with reader lock */
        if ( (e = dn2entry_r( be, dn, &matched )) == NULL ) {
                char *matched_dn = NULL;
-               struct berval **refs = NULL;
+               BVarray refs = NULL;
 
                if( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
@@ -60,15 +66,17 @@ ldbm_back_bind(
                                : NULL;
 
                        cache_return_entry_r( &li->li_cache, matched );
+
                } else {
-                       refs = default_referral;
+                       refs = referral_rewrite( default_referral,
+                               NULL, dn, LDAP_SCOPE_DEFAULT );
                }
 
                /* allow noauth binds */
                rc = 1;
                if ( method == LDAP_AUTH_SIMPLE ) {
-                       if ( be_isroot_pw( be, dn, cred ) ) {
-                               *edn = ch_strdup( be_root_dn( be ) );
+                       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 ) {
@@ -89,21 +97,25 @@ ldbm_back_bind(
                                NULL, NULL, NULL, NULL );
                }
 
-               if ( matched != NULL ) {
-                       ber_bvecfree( refs );
-                       free( matched_dn );
-               }
+               if ( refs ) bvarray_free( refs );
+               if ( matched_dn ) free( matched_dn );
                return( rc );
        }
 
-       *edn = ch_strdup( e->e_dn );
+       ber_dupbv( edn, &e->e_name );
 
        /* check for deleted */
 
        if ( is_entry_alias( e ) ) {
                /* entry is an alias, don't allow bind */
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+                          "ldbm_back_bind: entry (%s) is an alias.\n", e->e_dn ));
+#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 );
@@ -114,11 +126,17 @@ ldbm_back_bind(
 
        if ( is_entry_referral( e ) ) {
                /* entry is a referral, don't allow bind */
-               struct berval **refs = get_entry_referrals( be,
+               BVarray refs = get_entry_referrals( be,
                        conn, op, e );
 
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+                          "ldbm_back_bind: entry(%s) is a referral.\n", e->e_dn ));
+#else
                Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
                    0, 0 );
+#endif
+
 
                if( refs != NULL ) {
                        send_ldap_result( conn, op, LDAP_REFERRAL,
@@ -129,7 +147,7 @@ ldbm_back_bind(
                                NULL, NULL, NULL, NULL );
                }
 
-               ber_bvecfree( refs );
+               bvarray_free( refs );
 
                rc = 1;
                goto return_results;
@@ -138,10 +156,10 @@ ldbm_back_bind(
        switch ( method ) {
        case LDAP_AUTH_SIMPLE:
                /* check for root dn/passwd */
-               if ( be_isroot_pw( be, dn, cred ) ) {
+               if ( be_isroot_pw( be, conn, dn, cred ) ) {
                        /* front end will send result */
-                       if(*edn != NULL) free( *edn );
-                       *edn = ch_strdup( be_root_dn( be ) );
+                       if(edn->bv_val != NULL) free( edn->bv_val );
+                       ber_dupbv( edn, be_root_dn( be ) );
                        rc = 0;
                        goto return_results;
                }
@@ -164,7 +182,7 @@ ldbm_back_bind(
                        goto return_results;
                }
 
-               if ( slap_passwd_check( a, cred ) != 0 ) {
+               if ( slap_passwd_check( conn, a, cred ) != 0 ) {
                        send_ldap_result( conn, op, LDAP_INVALID_CREDENTIALS,
                                NULL, NULL, NULL, NULL );
                        /* stop front end from sending result */
@@ -185,7 +203,7 @@ ldbm_back_bind(
                }
 
                if ( ! access_allowed( be, conn, op, e,
-                       "krbname", NULL, ACL_AUTH ) )
+                       krbattr, NULL, ACL_AUTH ) )
                {
                        send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
                                NULL, NULL, NULL, NULL );
@@ -196,11 +214,11 @@ ldbm_back_bind(
                sprintf( krbname, "%s%s%s@%s", ad.pname, *ad.pinst ? "."
                    : "", ad.pinst, ad.prealm );
 
-               if ( (a = attr_find( e->e_attrs, "krbname" )) == NULL ) {
+               if ( (a = attr_find( e->e_attrs, krbattr )) == NULL ) {
                        /*
                         * no krbname values present:  check against DN
                         */
-                       if ( strcasecmp( dn, krbname ) == 0 ) {
+                       if ( strcasecmp( dn->bv_val, krbname ) == 0 ) {
                                rc = 0;
                                break;
                        }
@@ -215,7 +233,7 @@ ldbm_back_bind(
                        krbval.bv_val = krbname;
                        krbval.bv_len = strlen( krbname );
 
-                       if ( value_find( a->a_vals, &krbval, a->a_syntax, 3 ) != 0 ) {
+                       if ( value_find( a->a_desc, a->a_vals, &krbval ) != 0 ) {
                                send_ldap_result( conn, op,
                                    LDAP_INVALID_CREDENTIALS,
                                        NULL, NULL, NULL, NULL );