]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-mdb/dn2id.c
Plug memleak
[openldap] / servers / slapd / back-mdb / dn2id.c
index 6f53ec3edd892515cc0ca2ebbff1413f4f443fd7..82ec07b7f1c8b5df96b9529f755655b8d2f9a164 100644 (file)
@@ -141,7 +141,7 @@ mdb_dn2id_add(
        Entry           *e )
 {
        struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
-       MDB_dbi dbi = mdb->mi_dn2id->mdi_dbi;
+       MDB_dbi dbi = mdb->mi_dn2id;
        MDB_val         key, data;
        ID              nid;
        int             rc, rlen, nrlen;
@@ -211,7 +211,7 @@ mdb_dn2id_delete(
        Entry   *e )
 {
        struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
-       MDB_dbi dbi = mdb->mi_dn2id->mdi_dbi;
+       MDB_dbi dbi = mdb->mi_dn2id;
        MDB_val key, data;
        diskNode *d;
        int rc, nrlen;
@@ -246,94 +246,197 @@ mdb_dn2id_delete(
                rc = mdb_del( txn, dbi, &key, &data, MDB_DEL_DUP );
        }
 
-func_leave:
        op->o_tmpfree( d, op->o_tmpmemctx );
 
        Debug( LDAP_DEBUG_TRACE, "<= mdb_dn2id_delete 0x%lx: %d\n", e->e_id, rc, 0 );
        return rc;
 }
 
-
+/* return last found ID in *id if no match */
 int
 mdb_dn2id(
        Operation       *op,
        MDB_txn *txn,
        struct berval   *in,
-       ID      *id )
+       ID      *id,
+       struct berval   *matched )
 {
        struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
-       MDB_dbi dbi = mdb->mi_dn2id->mdi_dbi;
+       MDB_cursor *cursor;
+       MDB_dbi dbi = mdb->mi_dn2id;
        MDB_val         key, data;
        int             rc = 0, nrlen;
        diskNode *d;
        char    *ptr;
-       unsigned char dlen[2];
-       ID idp, parentID;
+       char dn[SLAP_LDAPDN_MAXLEN];
+       ID pid, nid;
+       struct berval tmp;
 
-#if 0
        Debug( LDAP_DEBUG_TRACE, "=> mdb_dn2id(\"%s\")\n", in->bv_val, 0, 0 );
 
-       nrlen = dn_rdnlen( op->o_bd, in );
-       if (!nrlen) nrlen = in->bv_len;
+       if ( !in->bv_len ) {
+               *id = 0;
+               nid = 0;
+               goto done;
+       }
 
-       DBTzero(&key);
-       key.size = sizeof(ID);
-       key.data = &idp;
-       key.ulen = sizeof(ID);
-       key.flags = DB_DBT_USERMEM;
-       parentID = ( ei->bei_parent != NULL ) ? ei->bei_parent->bei_id : 0;
-       MDB_ID2DISK( parentID, &idp );
+       tmp = *in;
 
-       DBTzero(&data);
-       data.size = sizeof(diskNode) + nrlen - sizeof(ID) - 1;
-       data.ulen = data.size * 3;
-       data.dlen = data.ulen;
-       data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
+       if ( matched ) {
+               matched->bv_val = dn + sizeof(dn) - 1;
+               matched->bv_len = 0;
+               *matched->bv_val-- = '\0';
+       }
 
-       rc = db->cursor( db, txn, cursor, mdb->bi_db_opflags );
-       if ( rc ) return rc;
+       nrlen = tmp.bv_len - op->o_bd->be_nsuffix[0].bv_len;
+       tmp.bv_val += nrlen;
+       tmp.bv_len = op->o_bd->be_nsuffix[0].bv_len;
+       nid = 0;
+       key.mv_size = sizeof(ID);
 
-       d = op->o_tmpalloc( data.size * 3, op->o_tmpmemctx );
-       d->nrdnlen[1] = nrlen & 0xff;
-       d->nrdnlen[0] = (nrlen >> 8) | 0x80;
-       dlen[0] = d->nrdnlen[0];
-       dlen[1] = d->nrdnlen[1];
-       ptr = lutil_strncopy( d->nrdn, in->bv_val, nrlen );
-       *ptr = '\0';
-       data.data = d;
+       rc = mdb_cursor_open( txn, dbi, &cursor );
+       if ( rc ) return rc;
 
-       rc = (*cursor)->c_get( *cursor, &key, &data, DB_GET_BOTH_RANGE );
-       if ( rc == 0 && (dlen[1] != d->nrdnlen[1] || dlen[0] != d->nrdnlen[0] ||
-               strncmp( d->nrdn, in->bv_val, nrlen ))) {
-               rc = DB_NOTFOUND;
-       }
-       if ( rc == 0 ) {
-               ptr = (char *) data.data + data.size - sizeof(ID);
-               MDB_DISK2ID( ptr, &ei->bei_id );
-               ei->bei_rdn.bv_len = data.size - sizeof(diskNode) - nrlen;
-               ptr = d->nrdn + nrlen + 1;
-               ber_str2bv( ptr, ei->bei_rdn.bv_len, 1, &ei->bei_rdn );
-               if ( ei->bei_parent != NULL && !ei->bei_parent->bei_dkids ) {
-                       db_recno_t dkids;
-                       /* How many children does the parent have? */
-                       /* FIXME: do we need to lock the parent
-                        * entryinfo? Seems safe...
-                        */
-                       (*cursor)->c_count( *cursor, &dkids, 0 );
-                       ei->bei_parent->bei_dkids = dkids;
+       for (;;) {
+               key.mv_data = &pid;
+               pid = nid;
+
+               data.mv_size = sizeof(diskNode) + tmp.bv_len;
+               d = op->o_tmpalloc( data.mv_size, op->o_tmpmemctx );
+               d->nrdnlen[1] = tmp.bv_len & 0xff;
+               d->nrdnlen[0] = (tmp.bv_len >> 8) | 0x80;
+               ptr = lutil_strncopy( d->nrdn, tmp.bv_val, tmp.bv_len );
+               *ptr = '\0';
+               data.mv_data = d;
+               rc = mdb_cursor_get( cursor, &key, &data, MDB_GET_BOTH );
+               op->o_tmpfree( d, op->o_tmpmemctx );
+               if ( rc )
+                       break;
+               ptr = (char *) data.mv_data + data.mv_size - sizeof(ID);
+               memcpy( &nid, ptr, sizeof(ID));
+
+               /* grab the non-normalized RDN */
+               if ( matched ) {
+                       int rlen;
+                       d = data.mv_data;
+                       rlen = data.mv_size - sizeof(diskNode) - tmp.bv_len;
+                       matched->bv_len += rlen;
+                       matched->bv_val -= rlen + 1;
+                       ptr = lutil_strcopy( matched->bv_val, d->rdn + tmp.bv_len );
+                       if ( pid ) {
+                               *ptr = ',';
+                               matched->bv_len++;
+                       }
+               }
+               if ( tmp.bv_val > in->bv_val ) {
+                       for (ptr = tmp.bv_val - 2; ptr > in->bv_val &&
+                               !DN_SEPARATOR(*ptr); ptr--)     /* empty */;
+                       if ( ptr >= in->bv_val ) {
+                               if (DN_SEPARATOR(*ptr)) ptr++;
+                               tmp.bv_len = tmp.bv_val - ptr - 1;
+                               tmp.bv_val = ptr;
+                       }
+               } else {
+                       break;
                }
        }
+       *id = nid; 
+       mdb_cursor_close( cursor );
+       if ( matched && matched->bv_len ) {
+               ptr = op->o_tmpalloc( matched->bv_len+1, op->o_tmpmemctx );
+               strcpy( ptr, matched->bv_val );
+               matched->bv_val = ptr;
+       }
 
-       op->o_tmpfree( d, op->o_tmpmemctx );
+done:
        if( rc != 0 ) {
                Debug( LDAP_DEBUG_TRACE, "<= mdb_dn2id: get failed: %s (%d)\n",
-                       db_strerror( rc ), rc, 0 );
+                       mdb_strerror( rc ), rc, 0 );
        } else {
                Debug( LDAP_DEBUG_TRACE, "<= mdb_dn2id: got id=0x%lx\n",
-                       ei->bei_id, 0, 0 );
+                       nid, 0, 0 );
+       }
+
+       return rc;
+}
+
+/* return IDs from root to parent of DN */
+int
+mdb_dn2sups(
+       Operation       *op,
+       MDB_txn *txn,
+       struct berval   *in,
+       ID      *ids )
+{
+       struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
+       MDB_cursor *cursor;
+       MDB_dbi dbi = mdb->mi_dn2id;
+       MDB_val         key, data;
+       int             rc = 0, nrlen;
+       diskNode *d;
+       char    *ptr;
+       ID pid, nid;
+       struct berval tmp;
+
+       Debug( LDAP_DEBUG_TRACE, "=> mdb_dn2sups(\"%s\")\n", in->bv_val, 0, 0 );
+
+       if ( !in->bv_len ) {
+               goto done;
+       }
+
+       tmp = *in;
+
+       nrlen = tmp.bv_len - op->o_bd->be_nsuffix[0].bv_len;
+       tmp.bv_val += nrlen;
+       tmp.bv_len = op->o_bd->be_nsuffix[0].bv_len;
+       nid = 0;
+       key.mv_size = sizeof(ID);
+
+       rc = mdb_cursor_open( txn, dbi, &cursor );
+       if ( rc ) return rc;
+
+       for (;;) {
+               key.mv_data = &pid;
+               pid = nid;
+
+               data.mv_size = sizeof(diskNode) + tmp.bv_len;
+               d = op->o_tmpalloc( data.mv_size, op->o_tmpmemctx );
+               d->nrdnlen[1] = tmp.bv_len & 0xff;
+               d->nrdnlen[0] = (tmp.bv_len >> 8) | 0x80;
+               ptr = lutil_strncopy( d->nrdn, tmp.bv_val, tmp.bv_len );
+               *ptr = '\0';
+               data.mv_data = d;
+               rc = mdb_cursor_get( cursor, &key, &data, MDB_GET_BOTH );
+               op->o_tmpfree( d, op->o_tmpmemctx );
+               if ( rc ) {
+                       mdb_cursor_close( cursor );
+                       break;
+               }
+               ptr = (char *) data.mv_data + data.mv_size - sizeof(ID);
+               memcpy( &nid, ptr, sizeof(ID));
+
+               if ( pid )
+                       mdb_idl_insert( ids, pid );
+
+               if ( tmp.bv_val > in->bv_val ) {
+                       for (ptr = tmp.bv_val - 2; ptr > in->bv_val &&
+                               !DN_SEPARATOR(*ptr); ptr--)     /* empty */;
+                       if ( ptr >= in->bv_val ) {
+                               if (DN_SEPARATOR(*ptr)) ptr++;
+                               tmp.bv_len = tmp.bv_val - ptr - 1;
+                               tmp.bv_val = ptr;
+                       }
+               } else {
+                       break;
+               }
+       }
+
+done:
+       if( rc != 0 ) {
+               Debug( LDAP_DEBUG_TRACE, "<= mdb_dn2sups: get failed: %s (%d)\n",
+                       mdb_strerror( rc ), rc, 0 );
        }
 
-#endif
        return rc;
 }
 
@@ -403,7 +506,7 @@ mdb_dn2id_children(
        Entry *e )
 {
        struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
-       MDB_dbi dbi = mdb->mi_dn2id->mdi_dbi;
+       MDB_dbi dbi = mdb->mi_dn2id;
        MDB_val         key, data;
        MDB_cursor      *cursor;
        int             rc;
@@ -432,11 +535,186 @@ int
 mdb_id2name(
        Operation *op,
        MDB_txn *txn,
+       MDB_cursor **cursp,
        ID id,
        struct berval *name,
        struct berval *nname )
 {
-       return 0;
+       struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
+       MDB_dbi dbi = mdb->mi_dn2id;
+       MDB_val         key, data;
+       MDB_cursor      *cursor;
+       int             rc, len, nlen;
+       char dn[SLAP_LDAPDN_MAXLEN], ndn[SLAP_LDAPDN_MAXLEN], *ptr;
+       char *dptr, *nptr;
+       diskNode *d;
+
+       key.mv_size = sizeof(ID);
+
+       if ( !*cursp ) {
+               rc = mdb_cursor_open( txn, dbi, cursp );
+               if ( rc ) return rc;
+       }
+       cursor = *cursp;
+
+       len = 0;
+       nlen = 0;
+       dptr = dn;
+       nptr = ndn;
+       while (id) {
+               int nrlen, rlen;
+               key.mv_data = &id;
+               data.mv_size = 0;
+               data.mv_data = "";
+               rc = mdb_cursor_get( cursor, &key, &data, MDB_SET );
+               if ( rc ) break;
+               ptr = data.mv_data;
+               ptr += data.mv_size - sizeof(ID);
+               memcpy( &id, ptr, sizeof(ID) );
+               d = data.mv_data;
+               nrlen = (d->nrdnlen[0] << 8) | d->nrdnlen[1];
+               if (nptr > ndn) {
+                       *nptr++ = ',';
+                       *dptr++ = ',';
+               }
+               /* copy name and trailing NUL */
+               memcpy( nptr, d->nrdn, nrlen+1 );
+               rlen = data.mv_size - sizeof(diskNode) - nrlen;
+               memcpy( dptr, d->nrdn+nrlen+1, rlen+1 );
+               nptr += nrlen;
+               dptr += rlen;
+       }
+       if ( rc == 0 ) {
+               name->bv_len = dptr - dn;
+               nname->bv_len = nptr - ndn;
+               name->bv_val = op->o_tmpalloc( name->bv_len + 1, op->o_tmpmemctx );
+               nname->bv_val = op->o_tmpalloc( nname->bv_len + 1, op->o_tmpmemctx );
+               memcpy( name->bv_val, dn, name->bv_len );
+               name->bv_val[name->bv_len] = '\0';
+               memcpy( nname->bv_val, ndn, nname->bv_len );
+               nname->bv_val[nname->bv_len] = '\0';
+       }
+       return rc;
+}
+
+/* Find each id in ids that is a child of base and move it to res.
+ */
+int
+mdb_idscope(
+       Operation *op,
+       MDB_txn *txn,
+       ID base,
+       ID *ids,
+       ID *res )
+{
+       struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
+       MDB_dbi dbi = mdb->mi_dn2id;
+       MDB_val         key, data;
+       MDB_cursor      *cursor;
+       ID ida, id, cid, ci0, idc = 0;
+       char    *ptr;
+       int             rc;
+
+       key.mv_size = sizeof(ID);
+
+       MDB_IDL_ZERO( res );
+
+       rc = mdb_cursor_open( txn, dbi, &cursor );
+       if ( rc ) return rc;
+
+       ida = mdb_idl_first( ids, &cid );
+
+       /* Don't bother moving out of ids if it's a range */
+       if (!MDB_IDL_IS_RANGE(ids)) {
+               idc = ids[0];
+               ci0 = cid;
+       }
+
+       while (ida != NOID) {
+               id = ida;
+               while (id) {
+                       key.mv_data = &id;
+                       rc = mdb_cursor_get( cursor, &key, &data, MDB_SET );
+                       if ( rc ) {
+                               /* not found, move on to next */
+                               if (idc) {
+                                       if (ci0 != cid)
+                                               ids[ci0] = ids[cid];
+                                       ci0++;
+                               }
+                               break;
+                       }
+                       ptr = data.mv_data;
+                       ptr += data.mv_size - sizeof(ID);
+                       memcpy( &id, ptr, sizeof(ID) );
+                       if ( id == base ) {
+                               res[0]++;
+                               res[res[0]] = ida;
+                               if (idc)
+                                       idc--;
+                               break;
+                       } else {
+                               if (idc) {
+                                       if (ci0 != cid)
+                                               ids[ci0] = ids[cid];
+                                       ci0++;
+                               }
+                       }
+                       if ( op->ors_scope == LDAP_SCOPE_ONELEVEL )
+                               break;
+               }
+               ida = mdb_idl_next( ids, &cid );
+       }
+       if (!MDB_IDL_IS_RANGE( ids ))
+               ids[0] = idc;
+
+       mdb_cursor_close( cursor );
+       return rc;
+}
+
+/* See if base is a child of any of the scopes
+ */
+int
+mdb_idscopes(
+       Operation *op,
+       MDB_txn *txn,
+       MDB_cursor **cursp,
+       ID base,
+       ID *scopes )
+{
+       struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
+       MDB_dbi dbi = mdb->mi_dn2id;
+       MDB_val         key, data;
+       MDB_cursor      *cursor;
+       ID id;
+       char    *ptr;
+       int             rc;
+       unsigned int x;
+
+       key.mv_size = sizeof(ID);
+
+       if ( !*cursp ) {
+               rc = mdb_cursor_open( txn, dbi, cursp );
+               if ( rc ) return rc;
+       }
+       cursor = *cursp;
+
+       id = base;
+       while (id) {
+               key.mv_data = &id;
+               rc = mdb_cursor_get( cursor, &key, &data, MDB_SET );
+               if ( rc )
+                       break;
+               ptr = data.mv_data;
+               ptr += data.mv_size - sizeof(ID);
+               memcpy( &id, ptr, sizeof(ID) );
+               x = mdb_idl_search( scopes, id );
+               if ( scopes[x] == id )
+                       return MDB_SUCCESS;
+               if ( op->ors_scope == LDAP_SCOPE_ONELEVEL )
+                       break;
+       }
+       return MDB_NOTFOUND;
 }
 
 #if 0