]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/backglue.c
Mem context tweaks for bdb_dn2idl
[openldap] / servers / slapd / backglue.c
index 1e4a81dd4f21566aca11f56cc0b3cf19942b2ae9..697ef05c0830dbcee15d7ca1a614a89e91cb2ec9 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;
@@ -48,6 +50,8 @@ typedef struct glueinfo {
 static int glueMode;
 static BackendDB *glueBack;
 
+static slap_response glue_back_response;
+
 /* Just like select_backend, but only for our backends */
 static BackendDB *
 glue_back_select (
@@ -55,7 +59,7 @@ glue_back_select (
        const char *dn
 )
 {
-       glueinfo *gi = *(glueinfo **) (be->bd_info+1);
+       glueinfo *gi = (glueinfo *) be->bd_info;
        struct berval bv;
        int i;
 
@@ -114,7 +118,7 @@ glue_back_db_open (
        BackendDB *be
 )
 {
-       glueinfo *gi = *(glueinfo **) (be->bd_info+1);
+       glueinfo *gi = (glueinfo *) be->bd_info;
        static int glueOpened = 0;
        int rc = 0;
 
@@ -122,10 +126,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 +139,7 @@ glue_back_db_close (
        BackendDB *be
 )
 {
-       glueinfo *gi = *(glueinfo **) (be->bd_info+1);
+       glueinfo *gi = (glueinfo *) be->bd_info;
        static int glueClosed = 0;
 
        if (glueClosed) return 0;
@@ -143,8 +147,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,18 +158,16 @@ glue_back_db_destroy (
        BackendDB *be
 )
 {
-       glueinfo *gi = *(glueinfo **) (be->bd_info+1);
+       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;
 }
 
 typedef struct glue_state {
        int err;
-       int nentries;
        int matchlen;
        char *matched;
        int nrefs;
@@ -173,160 +175,108 @@ typedef struct glue_state {
        slap_callback *prevcb;
 } glue_state;
 
-static void
-glue_back_response (
-       Connection *conn,
-       Operation *op,
-       ber_tag_t tag,
-       ber_int_t msgid,
-       ber_int_t err,
-       const char *matched,
-       const char *text,
-       BerVarray ref,
-       const char *resoid,
-       struct berval *resdata,
-       struct berval *sasldata,
-       LDAPControl **ctrls
-)
+static int
+glue_back_response ( Operation *op, SlapReply *rs )
 {
        glue_state *gs = op->o_callback->sc_private;
+       slap_callback *tmp = op->o_callback;
 
-       if (err == LDAP_SUCCESS || gs->err != LDAP_SUCCESS)
-               gs->err = err;
-       if (gs->err == LDAP_SUCCESS && gs->matched) {
-               free (gs->matched);
-               gs->matchlen = 0;
-       }
-       if (gs->err != LDAP_SUCCESS && matched) {
-               int len;
-               len = strlen (matched);
-               if (len > gs->matchlen) {
-                       if (gs->matched)
-                               free (gs->matched);
-                       gs->matched = ch_strdup (matched);
-                       gs->matchlen = len;
-               }
-       }
-       if (ref) {
-               int i, j, k;
-               BerVarray new;
-
-               for (i=0; ref[i].bv_val; i++);
-
-               j = gs->nrefs;
-               if (!j) {
-                       new = ch_malloc ((i+1)*sizeof(struct berval));
+       switch(rs->sr_type) {
+       case REP_SEARCH:
+       case REP_SEARCHREF:
+               op->o_callback = gs->prevcb;
+               if (op->o_callback && op->o_callback->sc_response) {
+                       rs->sr_err = op->o_callback->sc_response( op, rs );
+               } else if (rs->sr_type == REP_SEARCH) {
+                       rs->sr_err = send_search_entry( op, rs );
                } else {
-                       new = ch_realloc(gs->refs,
-                               (j+i+1)*sizeof(struct berval));
+                       rs->sr_err = send_search_reference( op, rs );
                }
-               for (k=0; k<i; j++,k++) {
-                       ber_dupbv( &new[j], &ref[k] );
+               op->o_callback = tmp;
+               return rs->sr_err;
+
+       default:
+               if (rs->sr_err == LDAP_SUCCESS || gs->err != LDAP_SUCCESS)
+                       gs->err = rs->sr_err;
+               if (gs->err == LDAP_SUCCESS && gs->matched) {
+                       ch_free (gs->matched);
+                       gs->matched = NULL;
+                       gs->matchlen = 0;
                }
-               new[j].bv_val = NULL;
-               gs->nrefs = j;
-               gs->refs = new;
-       }
-}
-
-static void
-glue_back_sresult (
-       Connection *c,
-       Operation *op,
-       ber_int_t err,
-       const char *matched,
-       const char *text,
-       BerVarray refs,
-       LDAPControl **ctrls,
-       int nentries
-)
-{
-       glue_state *gs = op->o_callback->sc_private;
+               if (gs->err != LDAP_SUCCESS && rs->sr_matched) {
+                       int len;
+                       len = strlen (rs->sr_matched);
+                       if (len > gs->matchlen) {
+                               if (gs->matched)
+                                       ch_free (gs->matched);
+                               gs->matched = ch_strdup (rs->sr_matched);
+                               gs->matchlen = len;
+                       }
+               }
+               if (rs->sr_ref) {
+                       int i, j, k;
+                       BerVarray new;
 
-       gs->nentries += nentries;
-       glue_back_response (c, op, 0, 0, err, matched, text, refs,
-                           NULL, NULL, NULL, ctrls);
-}
+                       for (i=0; rs->sr_ref[i].bv_val; i++);
 
-static int
-glue_back_sendentry (
-       BackendDB *be,
-       Connection *c,
-       Operation *op,
-       Entry *e,
-       AttributeName *an,
-       int ao,
-       LDAPControl **ctrls
-)
-{
-       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_sendentry) {
-               rc = op->o_callback->sc_sendentry(be, c, op, e, an, ao, ctrls);
-       } else {
-               rc = send_search_entry(be, c, op, e, an, ao, ctrls);
+                       j = gs->nrefs;
+                       if (!j) {
+                               new = ch_malloc ((i+1)*sizeof(struct berval));
+                       } else {
+                               new = ch_realloc(gs->refs,
+                                       (j+i+1)*sizeof(struct berval));
+                       }
+                       for (k=0; k<i; j++,k++) {
+                               ber_dupbv( &new[j], &rs->sr_ref[k] );
+                       }
+                       new[j].bv_val = NULL;
+                       gs->nrefs = j;
+                       gs->refs = new;
+               }
        }
-       op->o_callback = tmp;
-       return rc;
 }
 
 static int
-glue_back_search (
-       BackendDB *b0,
-       Connection *conn,
-       Operation *op,
-       struct berval *dn,
-       struct berval *ndn,
-       int scope,
-       int deref,
-       int slimit,
-       int tlimit,
-       Filter *filter,
-       struct berval *filterstr,
-       AttributeName *attrs,
-       int attrsonly
-)
+glue_back_search ( Operation *op, SlapReply *rs )
 {
-       glueinfo *gi = *(glueinfo **) (b0->bd_info+1);
-       BackendDB *be;
-       int i, rc = 0, t2limit = 0, s2limit = 0;
+       BackendDB *b0 = op->o_bd;
+       glueinfo *gi = (glueinfo *) b0->bd_info;
+       int i;
        long stoptime = 0;
-       glue_state gs = {0};
-       slap_callback cb;
+       glue_state gs = {0, 0, NULL, 0, NULL, NULL};
+       slap_callback cb = { glue_back_response };
+       int scope0, slimit0, tlimit0;
+       struct berval dn, ndn;
 
-       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;
 
-       if (tlimit) {
-               stoptime = slap_get_time () + tlimit;
+       if (op->ors_tlimit) {
+               stoptime = slap_get_time () + op->ors_tlimit;
        }
 
-       switch (scope) {
+       switch (op->ors_scope) {
        case LDAP_SCOPE_BASE:
-               be = glue_back_select (b0, ndn->bv_val);
+               op->o_bd = glue_back_select (b0, op->o_req_ndn.bv_val);
 
-               if (be && be->be_search) {
-                       rc = be->be_search (be, conn, op, dn, ndn, scope,
-                                  deref, slimit, tlimit, filter, filterstr,
-                                           attrs, attrsonly);
+               if (op->o_bd && op->o_bd->be_search) {
+                       rs->sr_err = op->o_bd->be_search( op, rs );
                } else {
-                       rc = LDAP_UNWILLING_TO_PERFORM;
-                       send_ldap_result (conn, op, rc, NULL,
-                                     "No search target found", NULL, NULL);
+                       send_ldap_error(op, rs, LDAP_UNWILLING_TO_PERFORM,
+                                     "No search target found");
                }
-               return rc;
+               return rs->sr_err;
 
        case LDAP_SCOPE_ONELEVEL:
        case LDAP_SCOPE_SUBTREE:
                op->o_callback = &cb;
-               rc = gs.err = LDAP_UNWILLING_TO_PERFORM;
+               rs->sr_err = gs.err = LDAP_UNWILLING_TO_PERFORM;
+               scope0 = op->ors_scope;
+               slimit0 = op->ors_slimit;
+               tlimit0 = op->ors_tlimit;
+               dn = op->o_req_dn;
+               ndn = op->o_req_ndn;
 
                /*
                 * Execute in reverse order, most general first 
@@ -334,64 +284,83 @@ glue_back_search (
                for (i = gi->nodes-1; i >= 0; i--) {
                        if (!gi->n[i].be || !gi->n[i].be->be_search)
                                continue;
-                       if (tlimit) {
-                               t2limit = stoptime - slap_get_time ();
-                               if (t2limit <= 0) {
-                                       rc = gs.err = LDAP_TIMELIMIT_EXCEEDED;
+                       if (tlimit0) {
+                               op->ors_tlimit = stoptime - slap_get_time ();
+                               if (op->ors_tlimit <= 0) {
+                                       rs->sr_err = gs.err = LDAP_TIMELIMIT_EXCEEDED;
                                        break;
                                }
                        }
-                       if (slimit) {
-                               s2limit = slimit - gs.nentries;
-                               if (s2limit <= 0) {
-                                       rc = gs.err = LDAP_SIZELIMIT_EXCEEDED;
+                       if (slimit0) {
+                               op->ors_slimit = slimit0 - rs->sr_nentries;
+                               if (op->ors_slimit <= 0) {
+                                       rs->sr_err = gs.err = LDAP_SIZELIMIT_EXCEEDED;
                                        break;
                                }
                        }
-                       rc = 0;
+                       rs->sr_err = 0;
                        /*
                         * check for abandon 
                         */
                        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],
-                                       LDAP_SCOPE_BASE, deref,
-                                       s2limit, t2limit, filter, filterstr,
-                                       attrs, attrsonly);
-
-                       } else if (scope == LDAP_SCOPE_SUBTREE &&
-                               dnIsSuffix(&be->be_nsuffix[0], ndn)) {
-                               rc = be->be_search (be, conn, op,
-                                       &be->be_suffix[0], &be->be_nsuffix[0],
-                                       scope, deref,
-                                       s2limit, t2limit, filter, filterstr,
-                                       attrs, attrsonly);
-
-                       } 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);
+                       op->o_bd = gi->n[i].be;
+                       if (scope0 == LDAP_SCOPE_ONELEVEL && 
+                               dn_match(&gi->n[i].pdn, &ndn)) {
+                               op->ors_scope = LDAP_SCOPE_BASE;
+                               op->o_req_dn = op->o_bd->be_suffix[0];
+                               op->o_req_ndn = op->o_bd->be_nsuffix[0];
+                               rs->sr_err = op->o_bd->be_search(op, rs);
+
+                       } else if (scope0 == LDAP_SCOPE_SUBTREE &&
+                               dnIsSuffix(&op->o_bd->be_nsuffix[0], &ndn)) {
+                               op->o_req_dn = op->o_bd->be_suffix[0];
+                               op->o_req_ndn = op->o_bd->be_nsuffix[0];
+                               rs->sr_err = op->o_bd->be_search( op, rs );
+
+                       } else if (dnIsSuffix(&ndn, &op->o_bd->be_nsuffix[0])) {
+                               rs->sr_err = op->o_bd->be_search( op, rs );
+                       }
+
+                       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:;
+               op->ors_scope = scope0;
+               op->ors_slimit = slimit0;
+               op->ors_tlimit = tlimit0;
+               op->o_req_dn = dn;
+               op->o_req_ndn = ndn;
+
                break;
        }
        op->o_callback = gs.prevcb;
+       rs->sr_err = gs.err;
+       rs->sr_matched = gs.matched;
+       rs->sr_ref = gs.refs;
 
-       send_search_result (conn, op, gs.err, gs.matched, NULL,
-               gs.refs, NULL, gs.nentries);
+       send_ldap_result( op, rs );
 
 done:
+       op->o_bd = b0;
        if (gs.matched)
                free (gs.matched);
        if (gs.refs)
                ber_bvarray_free(gs.refs);
-       return rc;
+       return rs->sr_err;
 }
 
 
@@ -431,7 +400,7 @@ glue_tool_entry_first (
        BackendDB *b0
 )
 {
-       glueinfo *gi = *(glueinfo **) (b0->bd_info+1);
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
 
        /* If we're starting from scratch, start at the most general */
@@ -456,7 +425,7 @@ glue_tool_entry_next (
        BackendDB *b0
 )
 {
-       glueinfo *gi = *(glueinfo **) (b0->bd_info+1);
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
        ID rc;
 
@@ -544,7 +513,7 @@ glue_tool_sync (
        BackendDB *b0
 )
 {
-       glueinfo *gi = *(glueinfo **) (b0->bd_info+1);
+       glueinfo *gi = (glueinfo *) b0->bd_info;
        int i;
 
        /* just sync everyone */
@@ -567,7 +536,7 @@ glue_sub_init( )
         * 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;
@@ -576,11 +545,11 @@ 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])) {
@@ -598,18 +567,10 @@ glue_sub_init( )
                                 */
                                b1->be_flags |= SLAP_BFLAG_GLUE_INSTANCE;
                                gi = (glueinfo *)ch_malloc(sizeof(glueinfo));
-
-                               /* Space for a copy of the backend, our
-                                * own backendInfo structure, and a pointer
-                                * to our glueinfo
-                                */
-                               gi->be = (BackendDB *)ch_malloc(
-                                       sizeof(BackendDB) + sizeof(BackendInfo) +
-                                       sizeof(glueinfo *) );
-                               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;
@@ -642,15 +603,10 @@ glue_sub_init( )
                        /* One more node for the master */
                        gi = (glueinfo *)ch_realloc(gi,
                                sizeof(glueinfo) + gi->nodes * sizeof(gluenode));
-                       gi->n[gi->nodes].be = gi->be;
+                       gi->n[gi->nodes].be = &gi->bd;
                        dnParent( &b1->be_nsuffix[0], &gi->n[gi->nodes].pdn );
                        gi->nodes++;
-                       b1->bd_info = bi;
-                       /* Save a pointer to our private info. Don't use
-                        * be_private or bi_private, to avoid having to fix
-                        * that up before calling the real backend.
-                        */
-                       *(glueinfo **)(bi+1) = gi;
+                       b1->bd_info = (BackendInfo *)gi;
                }
        }
        /* If there are any unresolved subordinates left, something is wrong */