]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/overlays/unique.c
Each refint op needs a unique timestamp, must perform searches as rootdn
[openldap] / servers / slapd / overlays / unique.c
index 30d35ad3bd826d7e2cc84a43ed1143d441401fa2..401f1840849d8d13f1493512daa02e93a7e92fe6 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2006 The OpenLDAP Foundation.
  * Portions Copyright 2004 Symas Corporation.
  * All rights reserved.
  *
@@ -29,6 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
+#include "config.h"
 
 static slap_overinst unique;
 
@@ -46,9 +47,200 @@ typedef struct unique_data_s {
 } unique_data;
 
 typedef struct unique_counter_s {
+       struct berval *ndn;
        int count;
 } unique_counter;
 
+enum {
+       UNIQUE_BASE = 1,
+       UNIQUE_IGNORE,
+       UNIQUE_ATTR,
+       UNIQUE_STRICT
+};
+
+static ConfigDriver unique_cf_gen;
+
+static ConfigTable uniquecfg[] = {
+       { "unique_base", "basedn", 2, 2, 0, ARG_DN|ARG_MAGIC|UNIQUE_BASE,
+         unique_cf_gen, "( OLcfgOvAt:10.1 NAME 'olcUniqueBase' "
+         "DESC 'Subtree for uniqueness searches' "
+         "SYNTAX OMsDN SINGLE-VALUE )", NULL, NULL },
+       { "unique_ignore", "attribute...", 2, 0, 0, ARG_MAGIC|UNIQUE_IGNORE,
+         unique_cf_gen, "( OLcfgOvAt:10.2 NAME 'olcUniqueIgnore' "
+         "DESC 'Attributes for which uniqueness shall not be enforced' "
+         "SYNTAX OMsDirectoryString )", NULL, NULL },
+       { "unique_attributes", "attribute...", 2, 0, 0, ARG_MAGIC|UNIQUE_ATTR,
+         unique_cf_gen, "( OLcfgOvAt:10.3 NAME 'olcUniqueAttribute' "
+         "DESC 'Attributes for which uniqueness shall be enforced' "
+         "SYNTAX OMsDirectoryString )", NULL, NULL },
+       { "unique_strict", "on|off", 1, 2, 0,
+         ARG_ON_OFF|ARG_OFFSET|UNIQUE_STRICT,
+         (void *)offsetof(unique_data, strict),
+         "( OLcfgOvAt:10.4 NAME 'olcUniqueStrict' "
+         "DESC 'Enforce uniqueness of null values' "
+         "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
+       { NULL, NULL, 0, 0, 0, ARG_IGNORED }
+};
+
+static ConfigOCs uniqueocs[] = {
+       { "( OLcfgOvOc:10.1 "
+         "NAME 'olcUniqueConfig' "
+         "DESC 'Attribute value uniqueness configuration' "
+         "SUP olcOverlayConfig "
+         "MAY ( olcUniqueBase $ olcUniqueIgnore $ "
+         "olcUniqueAttribute $ olcUniqueStrict ) )",
+         Cft_Overlay, uniquecfg },
+       { NULL, 0, NULL }
+};
+
+static int
+unique_cf_gen( ConfigArgs *c )
+{
+       slap_overinst *on = (slap_overinst *)c->bi;
+       unique_data *ud = (unique_data *)on->on_bi.bi_private;
+       BackendDB *be = (BackendDB *)c->be;
+       unique_attrs *up, *pup, **pupp = NULL;
+       AttributeDescription *ad;
+       const char *text;
+       int rc = ARG_BAD_CONF;
+       int i;
+
+       switch ( c->op ) {
+       case SLAP_CONFIG_EMIT:
+               switch ( c->type ) {
+               case UNIQUE_BASE:
+                       if ( !BER_BVISEMPTY( &ud->dn )) {
+                               rc = value_add_one( &c->rvalue_vals, &ud->dn );
+                               if ( rc ) return rc;
+                               rc = value_add_one( &c->rvalue_nvals, &ud->dn );
+                               return rc;
+                       }
+                       break;
+               case UNIQUE_IGNORE:
+                       /* fallthrough to UNIQUE_ATTR */
+               case UNIQUE_ATTR:
+                       if ( c->type == UNIQUE_IGNORE ) up = ud->ignore;
+                       else up = ud->attrs;
+                       while ( up ) {
+                               value_add_one( &c->rvalue_vals,
+                                              &up->attr->ad_cname );
+                               up = up->next;
+                       }
+                       rc = 0;
+                       break;
+               case UNIQUE_STRICT:
+                       /* handled via ARG_OFFSET */
+                       /* fallthrough to default */
+               default:
+                       abort ();
+               }
+               break;
+       case LDAP_MOD_DELETE:
+               switch ( c->type ) {
+               case UNIQUE_BASE:
+                       /* default to the base of our configured database */
+                       if ( ud->dn.bv_val ) ber_memfree ( ud->dn.bv_val );
+                       ber_dupbv( &ud->dn, &be->be_nsuffix[0] );
+                       rc = 0;
+                       break;
+               case UNIQUE_IGNORE:
+                       /* fallthrough to UNIQUE_ATTR */
+               case UNIQUE_ATTR:
+                       if ( c->type == UNIQUE_IGNORE ) pupp = &ud->ignore;
+                       else pupp = &ud->attrs;
+
+                       if ( c->valx < 0 ) {
+                               up = *pupp;
+                               *pupp = NULL;
+                               while ( up ) {
+                                       pup = up;
+                                       up = up->next;
+                                       ch_free ( pup );
+                               }
+
+                       } else {
+
+                               /* delete from linked list */
+                               for ( i=0; i < c->valx; ++i ) {
+                                       pupp = &(*pupp)->next;
+                               }
+                               up = *pupp;
+                               *pupp = (*pupp)->next;
+
+                               /* AttributeDescriptions are global so
+                                * shouldn't be freed here... */
+                               ch_free ( up );
+                       }
+                       rc = 0;
+                       break;
+               case UNIQUE_STRICT:
+                       /* handled via ARG_OFFSET */
+                       /* fallthrough to default */
+               default:
+                       abort ();
+               }
+               break;
+       case SLAP_CONFIG_ADD:
+               /* fallthrough to LDAP_MOD_ADD */
+       case LDAP_MOD_ADD:
+               switch ( c->type ) {
+               case UNIQUE_BASE:
+                       if ( !dnIsSuffix ( &c->value_ndn,
+                                          &be->be_nsuffix[0] ) ) {
+                               sprintf ( c->msg, "dn is not a suffix of backend base" );
+                               Debug ( LDAP_DEBUG_CONFIG, "unique add: %s\n",
+                                       c->msg, NULL, NULL );
+                               rc = ARG_BAD_CONF;
+                       }
+                       if ( ud->dn.bv_val ) ber_memfree ( ud->dn.bv_val );
+                       ud->dn = c->value_ndn;
+                       rc = 0;
+                       break;
+               case UNIQUE_IGNORE:
+                       /* fallthrough to UNIQUE_ATTR */
+               case UNIQUE_ATTR:
+                       rc = 0;
+                       for ( i=1; i < c->argc; ++i ) {
+                               ad = NULL;
+                               if ( slap_str2ad ( c->argv[i], &ad, &text )
+                                    == LDAP_SUCCESS) {
+
+                                       up = ch_malloc (
+                                               sizeof ( unique_attrs ) );
+                                       up->attr = ad;
+                                       if ( c->type == UNIQUE_IGNORE ) {
+                                               up->next = ud->ignore;
+                                               ud->ignore = up;
+                                       } else {
+                                               up->next = ud->attrs;
+                                               ud->attrs = up;
+                                       }
+                               } else {
+                                       Debug ( LDAP_DEBUG_CONFIG,
+                                               "unique add: <%s>: %s\n",
+                                               c->argv[i], text, NULL );
+                                       strncpy ( c->msg,
+                                                 text,
+                                                 SLAP_TEXT_BUFLEN-1 );
+                                       c->msg[SLAP_TEXT_BUFLEN-1] = '\0';
+                                       rc = ARG_BAD_CONF;
+                               }
+                       }
+                       break;
+               case UNIQUE_STRICT:
+                       /* handled via ARG_OFFSET */
+                       /* fallthrough to default */
+               default:
+                       abort ();
+               }
+               break;
+       default:
+               abort ();
+       }
+
+       return rc;
+}
+
 /*
 ** allocate new unique_data;
 ** initialize, copy basedn;
@@ -61,103 +253,28 @@ static int unique_db_init(
 )
 {
        slap_overinst *on = (slap_overinst *)be->bd_info;
-       unique_data *ud   = ch_malloc(sizeof(unique_data));
+       unique_data *ud   = ch_calloc(1,sizeof(unique_data));
 
        /* Debug(LDAP_DEBUG_TRACE, "==> unique_init\n", 0, 0, 0); */
 
        ud->message     = "_init";
-       ud->attrs       = NULL;
-       ud->ignore      = NULL;
-       ud->strict      = 0;
-
-       /* default to the base of our configured database */
-       ber_dupbv(&ud->dn, &be->be_nsuffix[0]);
        on->on_bi.bi_private = ud;
-
        return 0;
 }
 
-
-/*
-** if command = attributes:
-**     foreach argument:
-**             convert to attribute;
-**             add to configured attribute list;
-** elseif command = base:
-**     set our basedn to argument;
-** else complain about invalid directive;
-**
-*/
-
-static int unique_config(
-       BackendDB       *be,
-       const char      *fname,
-       int             lineno,
-       int             argc,
-       char            **argv
+static int unique_db_destroy(
+       BackendDB       *be
 )
 {
-       slap_overinst *on = (slap_overinst *) be->bd_info;
-       unique_data *ud   = on->on_bi.bi_private;
-       unique_attrs *up;
-       const char *text;
-       AttributeDescription *ad;
-       int i;
+       slap_overinst *on = (slap_overinst *)be->bd_info;
 
-       ud->message = "_config";
-       Debug(LDAP_DEBUG_TRACE, "==> unique_config\n", 0, 0, 0);
-
-       if(!strcasecmp(*argv, "unique_attributes") ||
-          !strcasecmp(*argv, "unique_ignore")) {
-               for(i = 1; i < argc; i++) {
-                       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",
-                                       fname, lineno, argv[i]);
-                               continue;
-                       }
-                       ad = NULL;
-                       if(slap_str2ad(argv[i], &ad, &text) != LDAP_SUCCESS) {
-                               Debug(LDAP_DEBUG_ANY,
-                                       "%s: line %d: bad attribute <%s>, ignored\n",
-                                       fname, lineno, text);
-                               continue;               /* XXX */
-                       } else if(ad->ad_next) {
-                               Debug(LDAP_DEBUG_ANY,
-                                       "%s: line %d: multiple attributes match <%s>, ignored\n",
-                                       fname, lineno, argv[i]);
-                               continue;
-                       }
-                       up = ch_malloc(sizeof(unique_attrs));
-                       up->attr = ad;
-                       if(!strcasecmp(*argv, "unique_ignore")) {
-                               up->next = ud->ignore;
-                               ud->ignore = up;
-                       } else {
-                               up->next = ud->attrs;
-                               ud->attrs = up;
-                       }
-                       Debug(LDAP_DEBUG_ANY, "%s: line %d: new attribute <%s>\n",
-                               fname, lineno, argv[i]);
-               }
-       } else if(!strcasecmp(*argv, "unique_strict")) {
-               ud->strict = 1;
-       } else if(!strcasecmp(*argv, "unique_base")) {
-               struct berval bv;
-               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",
-                       fname, lineno, argv[1]);
-       } else {
-               return(SLAP_CONF_UNKNOWN);
+       if ( on->on_bi.bi_private ) {
+               ch_free( on->on_bi.bi_private );
+               on->on_bi.bi_private = NULL;
        }
-
-       return(0);
+       return 0;
 }
 
-
 /*
 ** mostly, just print the init message;
 **
@@ -174,6 +291,13 @@ unique_open(
 
        Debug(LDAP_DEBUG_TRACE, "unique_open: overlay initialized\n", 0, 0, 0);
 
+       if ( BER_BVISNULL( &ud->dn )) {
+               if ( BER_BVISNULL( &be->be_nsuffix[0] ))
+                       return -1;
+
+               /* default to the base of our configured database */
+               ber_dupbv(&ud->dn, &be->be_nsuffix[0]);
+       }
        return(0);
 }
 
@@ -182,9 +306,6 @@ unique_open(
 ** foreach configured attribute:
 **     free it;
 ** free our basedn;
-** (do not) free ud->message;
-** reset on_bi.bi_private;
-** free our config data;
 **
 */
 
@@ -212,9 +333,7 @@ unique_close(
 
        ch_free(ud->dn.bv_val);
 
-       on->on_bi.bi_private = NULL;    /* XXX */
-
-       ch_free(ud);
+       memset( ud, 0, sizeof(*ud));
 
        return(0);
 }
@@ -231,16 +350,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);
 }
@@ -255,21 +381,35 @@ static int count_filter_len(
        unique_attrs *up;
        int i;
 
-       while(!is_at_operational(ad->ad_type)) {
-               if(ud->ignore) {
-                       for(up = ud->ignore; up; up = up->next)
-                               if(ad == up->attr) break;
-                       if(up) break;
+       while ( !is_at_operational( ad->ad_type ) ) {
+               if ( ud->ignore ) {
+                       for ( up = ud->ignore; up; up = up->next ) {
+                               if (ad == up->attr ) {
+                                       break;
+                               }
+                       }
+                       if ( up ) {
+                               break;
+                       }
                }
-               if(ud->attrs) {
-                       for(up = ud->attrs; up; up = up->next)
-                               if(ad == up->attr) break;
-                       if(!up) break;
+               if ( ud->attrs ) {
+                       for ( up = ud->attrs; up; up = up->next ) {
+                               if ( ad == up->attr ) {
+                                       break;
+                               }
+                       }
+                       if ( !up ) {
+                               break;
+                       }
                }
-               if(b && b[0].bv_val) for(i = 0; b[i].bv_val; i++)
-                       ks += b[i].bv_len + ad->ad_cname.bv_len + STRLENOF( "(=)" );
-               else if(ud->strict)
+               if ( b && b[0].bv_val ) {
+                       for (i = 0; b[i].bv_val; i++ ) {
+                               /* note: make room for filter escaping... */
+                               ks += ( 3 * b[i].bv_len ) + ad->ad_cname.bv_len + STRLENOF( "(=)" );
+                       }
+               } else if ( ud->strict ) {
                        ks += ad->ad_cname.bv_len + STRLENOF( "(=*)" ); /* (attr=*) */
+               }
                break;
        }
        return ks;
@@ -279,27 +419,47 @@ static char *build_filter(
        unique_data *ud,
        AttributeDescription *ad,
        BerVarray b,
-       char *kp
+       char *kp,
+       void *ctx
 )
 {
        unique_attrs *up;
        int i;
 
-       while(!is_at_operational(ad->ad_type)) {
-               if(ud->ignore) {
-                       for(up = ud->ignore; up; up = up->next)
-                               if(ad == up->attr) break;
-                       if(up) break;
+       while ( !is_at_operational( ad->ad_type ) ) {
+               if ( ud->ignore ) {
+                       for ( up = ud->ignore; up; up = up->next ) {
+                               if ( ad == up->attr ) {
+                                       break;
+                               }
+                       }
+                       if ( up ) {
+                               break;
+                       }
                }
-               if(ud->attrs) {
-                       for(up = ud->attrs; up; up = up->next)
-                               if(ad == up->attr) break;
-                       if(!up) break;
+               if ( ud->attrs ) {
+                       for ( up = ud->attrs; up; up = up->next ) {
+                               if ( ad == up->attr ) {
+                                       break;
+                               }
+                       }
+                       if ( !up ) {
+                               break;
+                       }
+               }
+               if ( b && b[0].bv_val ) {
+                       for ( i = 0; b[i].bv_val; i++ ) {
+                               struct berval   bv;
+
+                               ldap_bv2escaped_filter_value_x( &b[i], &bv, 1, ctx );
+                               kp += sprintf( kp, "(%s=%s)", ad->ad_cname.bv_val, bv.bv_val );
+                               if ( bv.bv_val != b[i].bv_val ) {
+                                       ber_memfree_x( bv.bv_val, ctx );
+                               }
+                       }
+               } else if ( ud->strict ) {
+                       kp += sprintf( kp, "(%s=*)", ad->ad_cname.bv_val );
                }
-               if(b && b[0].bv_val) for(i = 0; b[i].bv_val; i++)
-                       kp += sprintf(kp, "(%s=%s)", ad->ad_cname.bv_val, b[i].bv_val);
-               else if(ud->strict)
-                       kp += sprintf(kp, "(%s=*)", ad->ad_cname.bv_val);
                break;
        }
        return kp;
@@ -316,7 +476,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,17 +488,21 @@ 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 );
+       op->o_tmpfree( key, op->o_tmpmemctx );
 
        if(rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_OBJECT) {
                op->o_bd->bd_info = (BackendInfo *) on->on_info;
@@ -358,6 +522,8 @@ static int unique_search(
        return(SLAP_CB_CONTINUE);
 }
 
+#define ALLOC_EXTRA    16      /* extra slop */
+
 static int unique_add(
        Operation *op,
        SlapReply *rs
@@ -369,25 +535,12 @@ static int unique_add(
 
        Attribute *a;
        char *key, *kp;
-       int ks = 16;
+       int ks = 0;
 
        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;
@@ -405,12 +558,16 @@ static int unique_add(
                ks = count_filter_len(ud, a->a_desc, a->a_vals, ks);
        }
 
-       key = ch_malloc(ks);
+       if ( !ks )
+               return SLAP_CB_CONTINUE;
+
+       ks += ALLOC_EXTRA;
+       key = op->o_tmpalloc(ks, op->o_tmpmemctx);
 
        kp = key + sprintf(key, "(|");
 
        for(a = op->ora_e->e_attrs; a; a = a->a_next) {
-               kp = build_filter(ud, a->a_desc, a->a_vals, kp);
+               kp = build_filter(ud, a->a_desc, a->a_vals, kp, op->o_tmpmemctx);
        }
 
        sprintf(kp, ")");
@@ -432,24 +589,12 @@ static int unique_modify(
 
        Modifications *m;
        char *key, *kp;
-       int ks = 16;            /* a handful of extra bytes */
+       int ks = 0;
 
        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;
@@ -468,13 +613,17 @@ static int unique_modify(
                ks = count_filter_len(ud, m->sml_desc, m->sml_values, ks);
        }
 
-       key = ch_malloc(ks);
+       if ( !ks )
+               return SLAP_CB_CONTINUE;
+
+       ks += ALLOC_EXTRA;
+       key = op->o_tmpalloc(ks, op->o_tmpmemctx);
 
        kp = key + sprintf(key, "(|");
 
        for(m = op->orm_modlist; m; m = m->sml_next) {
                if ((m->sml_op & LDAP_MOD_OP) == LDAP_MOD_DELETE) continue;
-               kp = build_filter(ud, m->sml_desc, m->sml_values, kp);
+               kp = build_filter(ud, m->sml_desc, m->sml_values, kp, op->o_tmpmemctx);
        }
 
        sprintf(kp, ")");
@@ -495,27 +644,16 @@ static int unique_modrdn(
        Operation nop = *op;
 
        char *key, *kp;
-       int i, rc, ks = 16;             /* a handful of extra bytes */
+       int i, ks = 0;
        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 )) {
@@ -543,12 +681,16 @@ static int unique_modrdn(
                ks = count_filter_len(ud, newrdn[i]->la_private, bv, ks);
        }
 
-       key = ch_malloc(ks);
+       if ( !ks )
+               return SLAP_CB_CONTINUE;
+
+       ks += ALLOC_EXTRA;
+       key = op->o_tmpalloc(ks, op->o_tmpmemctx);
        kp = key + sprintf(key, "(|");
 
        for(i = 0; newrdn[i]; i++) {
                bv[0] = newrdn[i]->la_value;
-               kp = build_filter(ud, newrdn[i]->la_private, bv, kp);
+               kp = build_filter(ud, newrdn[i]->la_private, bv, kp, op->o_tmpmemctx);
        }
 
        sprintf(kp, ")");
@@ -563,12 +705,13 @@ static int unique_modrdn(
 ** it expects to be called automagically during dynamic module initialization
 */
 
-int unique_init() {
+int unique_initialize() {
+       int rc;
 
        /* statically declared just after the #includes at top */
        unique.on_bi.bi_type = "unique";
        unique.on_bi.bi_db_init = unique_db_init;
-       unique.on_bi.bi_db_config = unique_config;
+       unique.on_bi.bi_db_destroy = unique_db_destroy;
        unique.on_bi.bi_db_open = unique_open;
        unique.on_bi.bi_db_close = unique_close;
        unique.on_bi.bi_op_add = unique_add;
@@ -576,12 +719,16 @@ int unique_init() {
        unique.on_bi.bi_op_modrdn = unique_modrdn;
        unique.on_bi.bi_op_delete = NULL;
 
+       unique.on_bi.bi_cf_ocs = uniqueocs;
+       rc = config_register_schema( uniquecfg, uniqueocs );
+       if ( rc ) return rc;
+
        return(overlay_register(&unique));
 }
 
 #if SLAPD_OVER_UNIQUE == SLAPD_MOD_DYNAMIC && defined(PIC)
 int init_module(int argc, char *argv[]) {
-       return unique_init();
+       return unique_initialize();
 }
 #endif