]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/backglue.c
cleanup bind
[openldap] / servers / slapd / backglue.c
index c68c1708dd1f0907ed14477f6457c9cbc875a9e1..4db1e9f40a476d249dc763bef6c7d3e569952e3d 100644 (file)
@@ -1,7 +1,7 @@
 /* backglue.c - backend glue routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 2001-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2001-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -29,6 +29,7 @@
 
 #include <stdio.h>
 
+#include <ac/string.h>
 #include <ac/socket.h>
 
 #define SLAPD_TOOLS
@@ -40,7 +41,8 @@ typedef struct gluenode {
 } gluenode;
 
 typedef struct glueinfo {
-       BackendDB *be;
+       BackendInfo bi;
+       BackendDB bd;
        int nodes;
        gluenode n[1];
 } glueinfo;
@@ -55,7 +57,7 @@ glue_back_select (
        const char *dn
 )
 {
-       glueinfo *gi = (glueinfo *) be->be_private;
+       glueinfo *gi = (glueinfo *) be->bd_info;
        struct berval bv;
        int i;
 
@@ -63,7 +65,7 @@ glue_back_select (
        bv.bv_val = (char *) dn;
 
        for (i = 0; i<gi->nodes; i++) {
-               if (dnIsSuffix(&bv, gi->n[i].be->be_nsuffix[0])) {
+               if (dnIsSuffix(&bv, &gi->n[i].be->be_nsuffix[0])) {
                        return gi->n[i].be;
                }
        }
@@ -97,7 +99,7 @@ glue_back_close (
 )
 {
        static int glueClosed = 0;
-       int rc;
+       int rc = 0;
 
        if (glueClosed) return 0;
 
@@ -114,7 +116,7 @@ glue_back_db_open (
        BackendDB *be
 )
 {
-       glueinfo *gi = (glueinfo *)be->be_private;
+       glueinfo *gi = (glueinfo *) be->bd_info;
        static int glueOpened = 0;
        int rc = 0;
 
@@ -122,10 +124,10 @@ glue_back_db_open (
 
        glueOpened = 1;
 
-       gi->be->be_acl = be->be_acl;
+       gi->bd.be_acl = be->be_acl;
 
-       if (gi->be->bd_info->bi_db_open)
-               rc = gi->be->bd_info->bi_db_open(gi->be);
+       if (gi->bd.bd_info->bi_db_open)
+               rc = gi->bd.bd_info->bi_db_open(&gi->bd);
 
        return rc;
 }
@@ -135,7 +137,7 @@ glue_back_db_close (
        BackendDB *be
 )
 {
-       glueinfo *gi = (glueinfo *)be->be_private;
+       glueinfo *gi = (glueinfo *) be->bd_info;
        static int glueClosed = 0;
 
        if (glueClosed) return 0;
@@ -143,8 +145,8 @@ glue_back_db_close (
        glueClosed = 1;
 
        /* Close the master */
-       if (gi->be->bd_info->bi_db_close)
-               gi->be->bd_info->bi_db_close( gi->be );
+       if (gi->bd.bd_info->bi_db_close)
+               gi->bd.bd_info->bi_db_close( &gi->bd );
 
        return 0;
 }
@@ -154,11 +156,10 @@ glue_back_db_destroy (
        BackendDB *be
 )
 {
-       glueinfo *gi = (glueinfo *)be->be_private;
+       glueinfo *gi = (glueinfo *) be->bd_info;
 
-       if (gi->be->bd_info->bi_db_destroy)
-               gi->be->bd_info->bi_db_destroy( gi->be );
-       free (gi->be);
+       if (gi->bd.bd_info->bi_db_destroy)
+               gi->bd.bd_info->bi_db_destroy( &gi->bd );
        free (gi);
        return 0;
 }
@@ -195,6 +196,7 @@ glue_back_response (
                gs->err = err;
        if (gs->err == LDAP_SUCCESS && gs->matched) {
                free (gs->matched);
+               gs->matched = NULL;
                gs->matchlen = 0;
        }
        if (gs->err != LDAP_SUCCESS && matched) {
@@ -273,6 +275,31 @@ glue_back_sendentry (
        return rc;
 }
 
+static int
+glue_back_sendreference (
+       BackendDB *be,
+       Connection *c,
+       Operation *op,
+       Entry *e,
+       BerVarray bv,
+       LDAPControl **ctrls,
+       BerVarray *v2
+)
+{
+       slap_callback *tmp = op->o_callback;
+       glue_state *gs = tmp->sc_private;
+       int rc;
+
+       op->o_callback = gs->prevcb;
+       if (op->o_callback && op->o_callback->sc_sendreference) {
+               rc = op->o_callback->sc_sendreference( be, c, op, e, bv, ctrls, v2 );
+       } else {
+               rc = send_search_reference( be, c, op, e, bv, ctrls, v2 );
+       }
+       op->o_callback = tmp;
+       return rc;
+}
+
 static int
 glue_back_search (
        BackendDB *b0,
@@ -290,14 +317,17 @@ glue_back_search (
        int attrsonly
 )
 {
-       glueinfo *gi = (glueinfo *)b0->be_private;
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        BackendDB *be;
-       int i, rc, t2limit = 0, s2limit = 0;
+       int i, rc = 0, t2limit = 0, s2limit = 0;
        long stoptime = 0;
-       struct berval bv;
-       glue_state gs = {0};
-       slap_callback cb = {glue_back_response, glue_back_sresult, 
-               glue_back_sendentry, &gs};
+       glue_state gs = {0, 0, 0, NULL, 0, NULL, NULL};
+       slap_callback cb;
+
+       cb.sc_response = glue_back_response;
+       cb.sc_sresult = glue_back_sresult;
+       cb.sc_sendentry = glue_back_sendentry;
+       cb.sc_private = &gs;
 
        gs.prevcb = op->o_callback;
 
@@ -323,6 +353,7 @@ glue_back_search (
        case LDAP_SCOPE_ONELEVEL:
        case LDAP_SCOPE_SUBTREE:
                op->o_callback = &cb;
+               rc = gs.err = LDAP_UNWILLING_TO_PERFORM;
 
                /*
                 * Execute in reverse order, most general first 
@@ -332,48 +363,65 @@ glue_back_search (
                                continue;
                        if (tlimit) {
                                t2limit = stoptime - slap_get_time ();
-                               if (t2limit <= 0)
+                               if (t2limit <= 0) {
+                                       rc = gs.err = LDAP_TIMELIMIT_EXCEEDED;
                                        break;
+                               }
                        }
                        if (slimit) {
                                s2limit = slimit - gs.nentries;
-                               if (s2limit <= 0)
+                               if (s2limit <= 0) {
+                                       rc = gs.err = LDAP_SIZELIMIT_EXCEEDED;
                                        break;
+                               }
                        }
+                       rc = 0;
                        /*
                         * check for abandon 
                         */
-                       ldap_pvt_thread_mutex_lock (&op->o_abandonmutex);
-                       rc = op->o_abandon;
-                       ldap_pvt_thread_mutex_unlock (&op->o_abandonmutex);
-                       if (rc) {
-                               rc = 0;
+                       if (op->o_abandon) {
                                goto done;
                        }
                        be = gi->n[i].be;
                        if (scope == LDAP_SCOPE_ONELEVEL && 
                                dn_match(&gi->n[i].pdn, ndn)) {
                                rc = be->be_search (be, conn, op,
-                                       be->be_suffix[0], be->be_nsuffix[0],
+                                       &be->be_suffix[0], &be->be_nsuffix[0],
                                        LDAP_SCOPE_BASE, deref,
                                        s2limit, t2limit, filter, filterstr,
                                        attrs, attrsonly);
 
                        } else if (scope == LDAP_SCOPE_SUBTREE &&
-                               dnIsSuffix(be->be_nsuffix[0], ndn)) {
+                               dnIsSuffix(&be->be_nsuffix[0], ndn)) {
                                rc = be->be_search (be, conn, op,
-                                       be->be_suffix[0], be->be_nsuffix[0],
+                                       &be->be_suffix[0], &be->be_nsuffix[0],
                                        scope, deref,
                                        s2limit, t2limit, filter, filterstr,
                                        attrs, attrsonly);
 
-                       } else if (dnIsSuffix(&bv, be->be_nsuffix[0])) {
+                       } else if (dnIsSuffix(ndn, &be->be_nsuffix[0])) {
                                rc = be->be_search (be, conn, op, dn, ndn,
                                        scope, deref,
                                        s2limit, t2limit, filter, filterstr,
                                        attrs, attrsonly);
                        }
+
+                       switch ( gs.err ) {
+
+                       /*
+                        * Add errors that should result in dropping
+                        * the search
+                        */
+                       case LDAP_SIZELIMIT_EXCEEDED:
+                       case LDAP_TIMELIMIT_EXCEEDED:
+                       case LDAP_ADMINLIMIT_EXCEEDED:
+                               goto end_of_loop;
+                       
+                       default:
+                               break;
+                       }
                }
+end_of_loop:;
                break;
        }
        op->o_callback = gs.prevcb;
@@ -389,255 +437,6 @@ done:
        return rc;
 }
 
-static int
-glue_back_bind (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       int method,
-       struct berval *cred,
-       struct berval *edn
-)
-{
-       BackendDB *be;
-       int rc;
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_bind) {
-               conn->c_authz_backend = be;
-               rc = be->be_bind (be, conn, op, dn, ndn, method, cred, edn);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL, "No bind target found",
-                                 NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_compare (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       AttributeAssertion *ava
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_compare) {
-               rc = be->be_compare (be, conn, op, dn, ndn, ava);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL, "No compare target found",
-                       NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_modify (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       Modifications *mod
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_modify) {
-               rc = be->be_modify (be, conn, op, dn, ndn, mod);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL,
-                       "No modify target found", NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_modrdn (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       struct berval *newrdn,
-       struct berval *nnewrdn,
-       int del,
-       struct berval *newsup,
-       struct berval *nnewsup
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_modrdn) {
-               rc = be->be_modrdn (be, conn, op, dn, ndn,
-                       newrdn, nnewrdn, del, newsup, nnewsup );
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL,
-                       "No modrdn target found", NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_add (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       Entry *e
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, e->e_ndn);
-
-       if (be && be->be_add) {
-               rc = be->be_add (be, conn, op, e);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL, "No add target found",
-                                 NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_delete (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_delete) {
-               rc = be->be_delete (be, conn, op, dn, ndn);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-               send_ldap_result (conn, op, rc, NULL, "No delete target found",
-                                 NULL, NULL);
-       }
-       return rc;
-}
-
-static int
-glue_back_release_rw (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       Entry *e,
-       int rw
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, e->e_ndn);
-
-       if (be && be->be_release) {
-               rc = be->be_release (be, conn, op, e, rw);
-       } else {
-               entry_free (e);
-               rc = 0;
-       }
-       return rc;
-}
-
-static int
-glue_back_group (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       Entry *target,
-       struct berval *ndn,
-       struct berval *ondn,
-       ObjectClass *oc,
-       AttributeDescription * ad
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_group) {
-               rc = be->be_group (be, conn, op, target, ndn, ondn, oc, ad);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-       }
-       return rc;
-}
-
-static int
-glue_back_attribute (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       Entry *target,
-       struct berval *ndn,
-       AttributeDescription *ad,
-       BerVarray *vals
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_attribute) {
-               rc = be->be_attribute (be, conn, op, target, ndn, ad, vals);
-       } else {
-               rc = LDAP_UNWILLING_TO_PERFORM;
-       }
-       return rc;
-}
-
-static int
-glue_back_referrals (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       const char **text
-)
-{
-       BackendDB *be;
-       int rc;
-
-       be = glue_back_select (b0, ndn->bv_val);
-
-       if (be && be->be_chk_referrals) {
-               rc = be->be_chk_referrals (be, conn, op, dn, ndn, text);
-       } else {
-               rc = LDAP_SUCCESS;;
-       }
-       return rc;
-}
 
 static int
 glue_tool_entry_open (
@@ -675,7 +474,7 @@ glue_tool_entry_first (
        BackendDB *b0
 )
 {
-       glueinfo *gi = (glueinfo *) b0->be_private;
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
 
        /* If we're starting from scratch, start at the most general */
@@ -700,7 +499,7 @@ glue_tool_entry_next (
        BackendDB *b0
 )
 {
-       glueinfo *gi = (glueinfo *) b0->be_private;
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
        ID rc;
 
@@ -788,7 +587,7 @@ glue_tool_sync (
        BackendDB *b0
 )
 {
-       glueinfo *gi = (glueinfo *) b0->be_private;
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
 
        /* just sync everyone */
@@ -804,15 +603,14 @@ glue_sub_init( )
        int i, j;
        int cont = num_subordinates;
        BackendDB *b1, *be;
-       BackendInfo *bi;
+       BackendInfo *bi = NULL;
        glueinfo *gi;
-       struct berval bv;
 
        /* While there are subordinate backends, search backwards through the
         * backends and connect them to their superior.
         */
        for (i = nBackendDB - 1, b1=&backendDB[i]; cont && i>=0; b1--,i--) {
-               if (b1->be_flags & SLAP_BFLAG_GLUE_SUBORDINATE) {
+               if (SLAP_GLUE_SUBORDINATE ( b1 ) ) {
                        /* The last database cannot be a subordinate of noone */
                        if (i == nBackendDB - 1) {
                                b1->be_flags ^= SLAP_BFLAG_GLUE_SUBORDINATE;
@@ -821,14 +619,14 @@ glue_sub_init( )
                }
                gi = NULL;
                for (j = i-1, be=&backendDB[j]; j>=0; be--,j--) {
-                       if (!(be->be_flags & SLAP_BFLAG_GLUE_SUBORDINATE)) {
+                       if ( ! SLAP_GLUE_SUBORDINATE( be ) ) {
                                continue;
                        }
                        /* We will only link it once */
-                       if (be->be_flags & SLAP_BFLAG_GLUE_LINKED) {
+                       if ( SLAP_GLUE_LINKED( be ) ) {
                                continue;
                        }
-                       if (!dnIsSuffix(be->be_nsuffix[0], b1->be_nsuffix[0])) {
+                       if (!dnIsSuffix(&be->be_nsuffix[0], &b1->be_nsuffix[0])) {
                                continue;
                        }
                        cont--;
@@ -843,30 +641,17 @@ glue_sub_init( )
                                 */
                                b1->be_flags |= SLAP_BFLAG_GLUE_INSTANCE;
                                gi = (glueinfo *)ch_malloc(sizeof(glueinfo));
-                               gi->be = (BackendDB *)ch_malloc(
-                                       sizeof(BackendDB) + sizeof(BackendInfo));
-                               bi = (BackendInfo *)(gi->be+1);
-                               *gi->be = *b1;
                                gi->nodes = 0;
-                               *bi = *b1->bd_info;
+                               gi->bd = *b1;
+                               gi->bi = *b1->bd_info;
+                               bi = (BackendInfo *)gi;
                                bi->bi_open = glue_back_open;
                                bi->bi_close = glue_back_close;
                                bi->bi_db_open = glue_back_db_open;
                                bi->bi_db_close = glue_back_db_close;
                                bi->bi_db_destroy = glue_back_db_destroy;
 
-                               bi->bi_op_bind = glue_back_bind;
                                bi->bi_op_search = glue_back_search;
-                               bi->bi_op_compare = glue_back_compare;
-                               bi->bi_op_modify = glue_back_modify;
-                               bi->bi_op_modrdn = glue_back_modrdn;
-                               bi->bi_op_add = glue_back_add;
-                               bi->bi_op_delete = glue_back_delete;
-
-                               bi->bi_entry_release_rw = glue_back_release_rw;
-                               bi->bi_acl_group = glue_back_group;
-                               bi->bi_acl_attribute = glue_back_attribute;
-                               bi->bi_chk_referrals = glue_back_referrals;
 
                                /*
                                 * hooks for slap tools
@@ -885,31 +670,16 @@ glue_sub_init( )
                                        gi->nodes * sizeof(gluenode));
                        }
                        gi->n[gi->nodes].be = be;
-                       if ( dnParent( be->be_nsuffix[0]->bv_val, 
-                                       (const char **)&bv.bv_val ) 
-                                       != LDAP_SUCCESS ) {
-                               return -1;
-                       }
-                       bv.bv_len = be->be_nsuffix[0]->bv_len - (bv.bv_val -
-                               be->be_nsuffix[0]->bv_val);
-                       gi->n[gi->nodes].pdn = bv;
+                       dnParent( &be->be_nsuffix[0], &gi->n[gi->nodes].pdn ); 
                        gi->nodes++;
                }
                if (gi) {
                        /* One more node for the master */
                        gi = (glueinfo *)ch_realloc(gi,
                                sizeof(glueinfo) + gi->nodes * sizeof(gluenode));
-                       gi->n[gi->nodes].be = gi->be;
-                       if ( dnParent( b1->be_nsuffix[0]->bv_val, 
-                                       (const char **)&bv.bv_val ) 
-                                       != LDAP_SUCCESS ) {
-                               return -1;
-                       }
-                       bv.bv_len = b1->be_nsuffix[0]->bv_len - (bv.bv_val -
-                               b1->be_nsuffix[0]->bv_val);
-                       gi->n[gi->nodes].pdn = bv;
+                       gi->n[gi->nodes].be = &gi->bd;
+                       dnParent( &b1->be_nsuffix[0], &gi->n[gi->nodes].pdn );
                        gi->nodes++;
-                       b1->be_private = gi;
                        b1->bd_info = bi;
                }
        }