Left DN_INDICES defines by mistake... it's not ready for prime time yet.

Change prefixes to make eyeballing .dbb files easier

diff --git a/servers/slapd/back-ldbm/back-ldbm.h b/servers/slapd/back-ldbm/back-ldbm.h
index 5df341a6db5dc42e92674d5493f780578a53b9b5..377c8389f83e46f90db0b68cb4942705882f1368 100644 (file)
--- 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 2ae17df03c8e0d28f9093372904d947c91b710a9..c82ffb25760f94235f092afe0ab2dbfa43b77758 100644 (file)
--- 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 5c50f3909c2f7d8c8c7a3803a3a0602d9cd21176..180002e8dca9615ddf78a56637f0e7cc0e5b74e6 100644 (file)
--- 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 );