fix typo

[openldap] / servers / slapd / backglue.c

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index c12d4de4e1fe63b408b9d1b8b30c8ff2f13e394f..7cd176adcf6cfbbc63f546af44da3ade07fbf7b6 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -435,16 +435,19 @@ glue_op_search ( Operation *op, SlapReply *rs )
                        if (scope0 == LDAP_SCOPE_ONELEVEL && 
                                dn_match(pdn, &ndn))
                        {
+                               struct berval mdn, mndn;
                                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];
+                               mdn = op->o_req_dn = op->o_bd->be_suffix[0];
+                               mndn = op->o_req_ndn = op->o_bd->be_nsuffix[0];
                                rs->sr_err = op->o_bd->be_search(op, rs);
                                if ( rs->sr_err == LDAP_NO_SUCH_OBJECT ) {
                                        gs.err = LDAP_SUCCESS;
                                }
                                op->ors_scope = LDAP_SCOPE_ONELEVEL;
-                               op->o_req_dn = dn;
-                               op->o_req_ndn = ndn;
+                               if ( op->o_req_dn.bv_val == mdn.bv_val )
+                                       op->o_req_dn = dn;
+                               if ( op->o_req_ndn.bv_val == mndn.bv_val )
+                                       op->o_req_ndn = ndn;
 
                        } else if (scope0 == LDAP_SCOPE_SUBTREE &&
                                dn_match(&op->o_bd->be_nsuffix[0], &ndn))
@@ -454,14 +457,17 @@ glue_op_search ( Operation *op, SlapReply *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];
+                               struct berval mdn, mndn;
+                               mdn = op->o_req_dn = op->o_bd->be_suffix[0];
+                               mndn = op->o_req_ndn = op->o_bd->be_nsuffix[0];
                                rs->sr_err = glue_sub_search( op, rs, b0, on );
                                if ( rs->sr_err == LDAP_NO_SUCH_OBJECT ) {
                                        gs.err = LDAP_SUCCESS;
                                }
-                               op->o_req_dn = dn;
-                               op->o_req_ndn = ndn;
+                               if ( op->o_req_dn.bv_val == mdn.bv_val )
+                                       op->o_req_dn = dn;
+                               if ( op->o_req_ndn.bv_val == mndn.bv_val )
+                                       op->o_req_ndn = ndn;
 
                        } else if (dnIsSuffix(&ndn, &op->o_bd->be_nsuffix[0])) {
                                rs->sr_err = glue_sub_search( op, rs, b0, on );
@@ -524,8 +530,6 @@ end_of_loop:;
                op->ors_scope = scope0;
                op->ors_tlimit = tlimit0;
                op->o_time = starttime;
-               op->o_req_dn = dn;
-               op->o_req_ndn = ndn;
 
                break;
        }
@@ -792,6 +796,49 @@ glue_tool_entry_next (
        return rc;
 }
 
+static ID
+glue_tool_dn2id_get (
+       BackendDB *b0,
+       struct berval *dn
+)
+{
+       BackendDB *be, b2;
+       int rc = -1;
+
+       b2 = *b0;
+       b2.bd_info = (BackendInfo *)glue_tool_inst( b0->bd_info );
+       be = glue_back_select (&b2, dn);
+       if ( be == &b2 ) be = &toolDB;
+
+       if (!be->be_dn2id_get)
+               return NOID;
+
+       if (!glueBack) {
+               if ( be->be_entry_open ) {
+                       rc = be->be_entry_open (be, glueMode);
+               }
+               if (rc != 0) {
+                       return NOID;
+               }
+       } else if (be != glueBack) {
+               /* If this entry belongs in a different branch than the
+                * previous one, close the current database and open the
+                * new one.
+                */
+               if ( glueBack->be_entry_close ) {
+                       glueBack->be_entry_close (glueBack);
+               }
+               if ( be->be_entry_open ) {
+                       rc = be->be_entry_open (be, glueMode);
+               }
+               if (rc != 0) {
+                       return NOID;
+               }
+       }
+       glueBack = be;
+       return be->be_dn2id_get (be, dn);
+}
+
 static Entry *
 glue_tool_entry_get (
        BackendDB *b0,
@@ -848,6 +895,19 @@ glue_tool_entry_put (
        return be->be_entry_put (be, e, text);
 }
 
+static ID
+glue_tool_entry_modify (
+       BackendDB *b0,
+       Entry *e,
+       struct berval *text
+)
+{
+       if (!glueBack || !glueBack->be_entry_modify)
+               return NOID;
+
+       return glueBack->be_entry_modify (glueBack, e, text);
+}
+
 static int
 glue_tool_entry_reindex (
        BackendDB *b0,
@@ -921,17 +981,17 @@ glue_db_init(
                oi->oi_bi.bi_tool_entry_next = glue_tool_entry_next;
        if ( bi->bi_tool_entry_get )
                oi->oi_bi.bi_tool_entry_get = glue_tool_entry_get;
+       if ( bi->bi_tool_dn2id_get )
+               oi->oi_bi.bi_tool_dn2id_get = glue_tool_dn2id_get;
        if ( bi->bi_tool_entry_put )
                oi->oi_bi.bi_tool_entry_put = glue_tool_entry_put;
        if ( bi->bi_tool_entry_reindex )
                oi->oi_bi.bi_tool_entry_reindex = glue_tool_entry_reindex;
+       if ( bi->bi_tool_entry_modify )
+               oi->oi_bi.bi_tool_entry_modify = glue_tool_entry_modify;
        if ( bi->bi_tool_sync )
                oi->oi_bi.bi_tool_sync = glue_tool_sync;
 
-       /*FIXME : need to add support */
-       oi->oi_bi.bi_tool_dn2id_get = 0;
-       oi->oi_bi.bi_tool_entry_modify = 0;
-
        SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_GLUE_INSTANCE;
 
        return 0;
@@ -1043,7 +1103,7 @@ glue_sub_attach()
 
                        /* If it's not already configured, set up the overlay */
                        if ( !SLAP_GLUE_INSTANCE( be )) {
-                               rc = overlay_config( be, glue.on_bi.bi_type, -1, NULL );
+                               rc = overlay_config( be, glue.on_bi.bi_type, -1, NULL, NULL);
                                if ( rc )
                                        break;
                        }