Fix void* pointer arithmetic from ber_bvchr()

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

diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c
index 79e7db9403785bd5c59f1218097b9ec2eb872d6d..d1df4dbb3ea234acc71bd6bafd7cf6b16cc9c827 100644 (file)
--- a/servers/slapd/overlays/unique.c
+++ b/servers/slapd/overlays/unique.c
@@ -139,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")) {
@@ -149,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);
@@ -347,6 +347,7 @@ static int unique_search(
        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 );
@@ -384,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;
@@ -447,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;
@@ -506,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 )) {