From 00ba798bd46c85054e06ec18cd437b6ae2501c06 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 12 Aug 1999 01:05:33 +0000 Subject: [PATCH] Left DN_INDICES defines by mistake... it's not ready for prime time yet. Change prefixes to make eyeballing .dbb files easier --- servers/slapd/back-ldbm/back-ldbm.h | 9 ++++----- servers/slapd/back-ldbm/dn2id.c | 3 ++- servers/slapd/tools/ldif2id2children.c | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/servers/slapd/back-ldbm/back-ldbm.h b/servers/slapd/back-ldbm/back-ldbm.h index 5df341a6db..377c8389f8 100644 --- a/servers/slapd/back-ldbm/back-ldbm.h +++ b/servers/slapd/back-ldbm/back-ldbm.h @@ -24,11 +24,10 @@ LDAP_BEGIN_DECL #define SUBLEN 3 -#define DN_INDICES 1 -/* #define DN_INDICES 1 *//* generate dn eq, subtree, and parent indices */ +/* #undef DN_INDICES *//* generate dn eq, subtree, and parent indices */ #define DN_ENTRY_PREFIX '=' -#define DN_SUBTREE_PREFIX '+' -#define DN_PARENT_PREFIX '-' +#define DN_SUBTREE_PREFIX '?' +#define DN_PARENT_PREFIX '@' /* * there is a single index for each attribute. these prefixes ensure @@ -42,7 +41,7 @@ LDAP_BEGIN_DECL /* allow 3 characters per byte + PREFIX + EOS */ #define CONT_SIZE ( sizeof(long)*3 + 1 + 1 ) -#undef CONT_POSTFIX /* postfix original key */ +/* #undef CONT_POSTFIX *//* postfix original key */ #define UNKNOWN_PREFIX '?' /* prefix for unknown keys */ diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c index 2ae17df03c..c82ffb2576 100644 --- a/servers/slapd/back-ldbm/dn2id.c +++ b/servers/slapd/back-ldbm/dn2id.c @@ -79,7 +79,8 @@ dn2id_add( for( i=0; subtree[i] != NULL; i++ ) { key.dsize = strlen( subtree[i] ) + 2; key.dptr = ch_malloc( key.dsize ); - sprintf( key.dptr, "%c%s", DN_SUBTREE_PREFIX, subtree[i] ); + sprintf( key.dptr, "%c%s", + DN_SUBTREE_PREFIX, subtree[i] ); rc = idl_insert_key( be, db, key, id ); diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c index 5c50f3909c..180002e8dc 100644 --- a/servers/slapd/tools/ldif2id2children.c +++ b/servers/slapd/tools/ldif2id2children.c @@ -111,7 +111,8 @@ main( int argc, char **argv ) if( pdn != NULL ) { key.dsize = strlen( pdn ) + 2; key.dptr = ch_malloc( key.dsize ); - sprintf( key.dptr, "%c%s", DN_PARENT_PREFIX, pdn ); + sprintf( key.dptr, "%c%s", + DN_PARENT_PREFIX, pdn ); rc = idl_insert_key( be, db, key, id ); free( key.dptr ); } @@ -131,7 +132,8 @@ main( int argc, char **argv ) for( i=0; subtree[i] != NULL; i++ ) { key.dsize = strlen( subtree[i] ) + 2; key.dptr = ch_malloc( key.dsize ); - sprintf( key.dptr, "%c%s", DN_SUBTREE_PREFIX, subtree[i] ); + sprintf( key.dptr, "%c%s", + DN_SUBTREE_PREFIX, subtree[i] ); rc = idl_insert_key( be, db, key, id ); -- 2.39.5