Cleanup

[openldap] / servers / slapd / overlays / unique.c

diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c
index 30d35ad3bd826d7e2cc84a43ed1143d441401fa2..d1df4dbb3ea234acc71bd6bafd7cf6b16cc9c827 100644 (file)
--- a/servers/slapd/overlays/unique.c
+++ b/servers/slapd/overlays/unique.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
  * Portions Copyright 2004 Symas Corporation.
  * All rights reserved.
  *
@@ -46,6 +46,7 @@ typedef struct unique_data_s {
 } unique_data;
 
 typedef struct unique_counter_s {
+       struct berval *ndn;
        int count;
 } unique_counter;
 
@@ -113,7 +114,7 @@ static int unique_config(
                        for(up = ud->attrs; up; up = up->next)
                            if(!strcmp(argv[i], up->attr->ad_cname.bv_val)) {
                                Debug(LDAP_DEBUG_ANY,
-                                       "%s: line %d: duplicate attribute <s>, ignored\n",
+                                       "%s: line %d: duplicate attribute <%s>, ignored\n",
                                        fname, lineno, argv[i]);
                                continue;
                        }
@@ -138,7 +139,7 @@ static int unique_config(
                                up->next = ud->attrs;
                                ud->attrs = up;
                        }
-                       Debug(LDAP_DEBUG_ANY, "%s: line %d: new attribute <%s>\n",
+                       Debug(LDAP_DEBUG_CONFIG, "%s: line %d: new attribute <%s>\n",
                                fname, lineno, argv[i]);
                }
        } else if(!strcasecmp(*argv, "unique_strict")) {
@@ -148,7 +149,7 @@ static int unique_config(
                ber_str2bv( argv[1], 0, 0, &bv );
                ch_free(ud->dn.bv_val);
                dnNormalize(0, NULL, NULL, &bv, &ud->dn, NULL);
-               Debug(LDAP_DEBUG_ANY, "%s: line %d: new base dn <%s>\n",
+               Debug(LDAP_DEBUG_CONFIG, "%s: line %d: new base dn <%s>\n",
                        fname, lineno, argv[1]);
        } else {
                return(SLAP_CONF_UNKNOWN);
@@ -231,16 +232,23 @@ static int count_attr_cb(
        SlapReply *rs
 )
 {
+       unique_counter *uc;
+
        /* because you never know */
        if(!op || !rs) return(0);
 
        /* Only search entries are interesting */
        if(rs->sr_type != REP_SEARCH) return(0);
 
+       uc = op->o_callback->sc_private;
+
+       /* Ignore the current entry */
+       if ( dn_match( uc->ndn, &rs->sr_entry->e_nname )) return(0);
+
        Debug(LDAP_DEBUG_TRACE, "==> count_attr_cb <%s>\n",
                rs->sr_entry ? rs->sr_entry->e_name.bv_val : "UNKNOWN_DN", 0, 0);
 
-       ((unique_counter*)op->o_callback->sc_private)->count++;
+       uc->count++;
 
        return(0);
 }
@@ -316,7 +324,7 @@ static int unique_search(
        unique_data *ud = on->on_bi.bi_private;
        SlapReply nrs = { REP_RESULT };
        slap_callback cb = { NULL, NULL, NULL, NULL }; /* XXX */
-       unique_counter uq = { 0 };
+       unique_counter uq = { NULL, 0 };
        int rc;
 
        nop->ors_filter = str2filter_x(nop, key);
@@ -328,14 +336,18 @@ static int unique_search(
        nop->o_tag      = LDAP_REQ_SEARCH;
        nop->ors_scope  = LDAP_SCOPE_SUBTREE;
        nop->ors_deref  = LDAP_DEREF_NEVER;
+       nop->ors_limit  = NULL;
        nop->ors_slimit = SLAP_NO_LIMIT;
        nop->ors_tlimit = SLAP_NO_LIMIT;
        nop->ors_attrs  = slap_anlist_no_attrs;
        nop->ors_attrsonly = 1;
 
+       uq.ndn = &op->o_req_ndn;
+
        nop->o_req_ndn  = ud->dn;
        nop->o_ndn = op->o_bd->be_rootndn;
 
+       nop->o_bd = on->on_info->oi_origdb;
        rc = nop->o_bd->be_search(nop, &nrs);
        filter_free_x(nop, nop->ors_filter);
        ch_free( key );
@@ -373,21 +385,8 @@ static int unique_add(
 
        Debug(LDAP_DEBUG_TRACE, "==> unique_add <%s>\n", op->o_req_dn.bv_val, 0, 0);
 
-       /* validate backend. Should have already been done, but whatever */
-       nop.o_bd = select_backend(&ud->dn, 0, 1);
-       if(nop.o_bd) {
-               if (!nop.o_bd->be_search) {
-                       op->o_bd->bd_info = (BackendInfo *) on->on_info;
-                       send_ldap_error(op, rs, LDAP_UNWILLING_TO_PERFORM,
-                       "backend missing search function");
-                       return(rs->sr_err);
-               }
-       } else {
-               op->o_bd->bd_info = (BackendInfo *) on->on_info;
-               send_ldap_error(op, rs, LDAP_OTHER,
-                       "no known backend? this shouldn't be happening!");
-               return(rs->sr_err);
-       }
+       if ( !dnIsSuffix( &op->o_req_ndn, &ud->dn ))
+               return SLAP_CB_CONTINUE;
 
 /*
 ** count everything first;
@@ -436,20 +435,8 @@ static int unique_modify(
 
        Debug(LDAP_DEBUG_TRACE, "==> unique_modify <%s>\n", op->o_req_dn.bv_val, 0, 0);
 
-       nop.o_bd = select_backend(&ud->dn, 0, 1);
-       if(nop.o_bd) {
-               if (!nop.o_bd->be_search) {
-                       op->o_bd->bd_info = (BackendInfo *) on->on_info;
-                       send_ldap_error(op, rs, LDAP_UNWILLING_TO_PERFORM,
-                       "backend missing search function");
-                       return(rs->sr_err);
-               }
-       } else {
-               op->o_bd->bd_info = (BackendInfo *) on->on_info;
-               send_ldap_error(op, rs, LDAP_OTHER,
-                       "no known backend? this shouldn't be happening!");
-               return(rs->sr_err);
-       }
+       if ( !dnIsSuffix( &op->o_req_ndn, &ud->dn ))
+               return SLAP_CB_CONTINUE;
 
 /*
 ** count everything first;
@@ -495,27 +482,16 @@ static int unique_modrdn(
        Operation nop = *op;
 
        char *key, *kp;
-       int i, rc, ks = 16;             /* a handful of extra bytes */
+       int i, ks = 16;                 /* a handful of extra bytes */
        LDAPRDN newrdn;
        struct berval bv[2];
 
        Debug(LDAP_DEBUG_TRACE, "==> unique_modrdn <%s> <%s>\n",
                op->o_req_dn.bv_val, op->orr_newrdn.bv_val, 0);
 
-       nop.o_bd = select_backend(&ud->dn, 0, 1);
-       if(nop.o_bd) {
-               if (!nop.o_bd->be_search) {
-                       op->o_bd->bd_info = (BackendInfo *) on->on_info;
-                       send_ldap_error(op, rs, LDAP_UNWILLING_TO_PERFORM,
-                       "backend missing search function");
-                       return(rs->sr_err);
-               }
-       } else {
-               op->o_bd->bd_info = (BackendInfo *) on->on_info;
-               send_ldap_error(op, rs, LDAP_OTHER,
-                       "no known backend? this shouldn't be happening!");
-               return(rs->sr_err);
-       }
+       if ( !dnIsSuffix( &op->o_req_ndn, &ud->dn ) && 
+               (!op->orr_nnewSup || !dnIsSuffix( op->orr_nnewSup, &ud->dn )))
+               return SLAP_CB_CONTINUE;
 
        if(ldap_bv2rdn_x(&op->oq_modrdn.rs_newrdn, &newrdn,
                (char **)&rs->sr_text, LDAP_DN_FORMAT_LDAP, op->o_tmpmemctx )) {