upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 08:39:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

BDB_HIER was defined by accident, undef

Browse source 
Fix up for SLAP_NVALUES_ON_DISK
This commit is contained in:
Howard Chu 2003-03-23 15:27:43 +00:00
parent 2d78fafe03
commit 79f3ea6e80
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/back-bdb/back-bdb.h
View file

@ -14,7 +14,7 @@
LDAP_BEGIN_DECL
#define BDB_HIER 1
/* #define BDB_HIER 1 */
#define DN_BASE_PREFIX SLAP_INDEX_EQUALITY_PREFIX
#define DN_ONE_PREFIX '%'

11
servers/slapd/back-bdb/id2entry.c
View file

@ -24,13 +24,14 @@ int bdb_id2entry_put(
struct berval bv;
int rc;
#ifdef BDB_HIER
char *odn, *ondn;
struct berval odn, ondn;
/* We only store rdns, and they go in the id2parent database. */
odn = e->e_dn; ondn = e->e_ndn;
odn = e->e_name; ondn = e->e_nname;
e->e_dn = ""; e->e_ndn = "";
e->e_name = slap_empty_bv;
e->e_nname = slap_empty_bv;
#endif
DBTzero( &key );
key.data = (char *) &e->e_id;
@ -38,7 +39,7 @@ int bdb_id2entry_put(
rc = entry_encode( e, &bv );
#ifdef BDB_HIER
e->e_dn = odn; e->e_ndn = ondn;
e->e_name = odn; e->e_nname = ondn;
#endif
if( rc != LDAP_SUCCESS ) {
return -1;
@ -204,7 +205,7 @@ int bdb_entry_return(
if( (void *) e->e_attrs != (void *) (e+1)) {
attrs_free( e->e_attrs );
}
#ifdef SLAP_NVALUES
#if defined(SLAP_NVALUES) && !defined(SLAP_NVALUES_ON_DISK)
else {
/* nvals are not contiguous with the rest. oh well. */
Attribute *a;