X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fdn2id.c;h=93af8de63225735a6212f4acfff62411db11f30a;hb=324431062bff39a1bd3969bd37d4913526dd583f;hp=2092b46f39c08943718068fb7f6dc295508c6dda;hpb=67a64c293513ab6f4541e84d2b5a55ae1e1385f1;p=openldap

diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 2092b46f39..93af8de632 100644
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -1,8 +1,17 @@
 /* dn2id.c - routines to deal with the dn2id index */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -19,44 +28,37 @@
 int
 dn2id_add(
     Backend	*be,
-    const char	*dn,
+    struct berval *dn,
     ID		id
 )
 {
 	int		rc, flags;
 	DBCache	*db;
 	Datum		key, data;
-	char		*buf, *ptr, *pdn;
+	char		*buf;
+	struct berval	ptr, pdn;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "dn2id_add: (%s):%ld\n", dn, id ));
-#else
-	Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
-#endif
+	Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn->bv_val, id, 0 );
 
 	assert( id != NOID );
 
-	if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
-	    == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-			   "dn2id_add: couldn't open/create dn2id%s\n", LDBM_SUFFIX ));
-#else
+	db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT );
+	if ( db == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "Could not open/create dn2id%s\n",
 		    LDBM_SUFFIX, 0, 0 );
-#endif
 
 		return( -1 );
 	}
 
 	ldbm_datum_init( key );
-	key.dsize = strlen( dn ) + 2;
+	key.dsize = dn->bv_len + 2;
 	buf = ch_malloc( key.dsize );
 	key.dptr = buf;
 	buf[0] = DN_BASE_PREFIX;
-	ptr = buf + 1;
-	strcpy( ptr, dn );
+	ptr.bv_val = buf + 1;
+	ptr.bv_len = dn->bv_len;
+	AC_MEMCPY( ptr.bv_val, dn->bv_val, dn->bv_len );
+	ptr.bv_val[ dn->bv_len ] = '\0';
 
 	ldbm_datum_init( data );
 	data.dptr = (char *) &id;
@@ -65,52 +67,43 @@ dn2id_add(
 	flags = LDBM_INSERT;
 	rc = ldbm_cache_store( db, key, data, flags );
 
-	if ( rc != -1 && !be_issuffix( be, ptr )) {
+	if ( rc != -1 && !be_issuffix( be, &ptr )) {
 		buf[0] = DN_SUBTREE_PREFIX;
 		ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
 		rc = idl_insert_key( be, db, key, id );
 		ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
-	}
 
-	if ( rc != -1 ) {
-		pdn = dn_parent( be, ptr );
+		if ( rc != -1 ) {
+			dnParent( &ptr, &pdn );
 
-		if( pdn != NULL ) {
-			pdn[-1] = DN_ONE_PREFIX;
-			key.dsize -= pdn - ptr;
-			key.dptr = pdn - 1;
+			pdn.bv_val[-1] = DN_ONE_PREFIX;
+			key.dsize = pdn.bv_len + 2;
+			key.dptr = pdn.bv_val - 1;
+			ptr = pdn;
 			ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
 			rc = idl_insert_key( be, db, key, id );
 			ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
 		}
 	}
 
-	while ( rc != -1 && pdn != NULL ) {
-		if ( be_issuffix( be, pdn ))
-			break;
-
-		pdn[-1] = DN_SUBTREE_PREFIX;
+	while ( rc != -1 && !be_issuffix( be, &ptr )) {
+		ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
 		ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
 		rc = idl_insert_key( be, db, key, id );
 		ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
 
 		if( rc != 0 ) break;
+		dnParent( &ptr, &pdn );
+		key.dsize = pdn.bv_len + 2;
+		key.dptr = pdn.bv_val - 1;
 		ptr = pdn;
-		pdn = dn_parent( be, pdn );
-		key.dsize -= pdn - ptr;
-		key.dptr = pdn - 1;
 	}
 
 	free( buf );
 	ldbm_cache_close( be, db );
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "dn2id_add: return %d\n", rc ));
-#else
 	Debug( LDAP_DEBUG_TRACE, "<= dn2id_add %d\n", rc, 0, 0 );
-#endif
 
 	return( rc );
 }
@@ -118,45 +111,32 @@ dn2id_add(
 int
 dn2id(
     Backend	*be,
-    const char	*dn,
+    struct berval *dn,
     ID          *idp
 )
 {
 	struct ldbminfo	*li = (struct ldbminfo *) be->be_private;
 	DBCache	*db;
 	Datum		key, data;
+	unsigned char	*tmp;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "dn2id: (%s)\n", dn ));
-#else
-	Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
-#endif
+	Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
 
-	assert( idp );
+	assert( idp != NULL );
 
 	/* first check the cache */
-	if ( (*idp = cache_find_entry_ndn2id( be, &li->li_cache, dn )) != NOID ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-			   "dn2id: (%s)%ld in cache.\n", dn, *idp ));
-#else
+	*idp = cache_find_entry_ndn2id( be, &li->li_cache, dn );
+	if ( *idp != NOID ) {
 		Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", *idp,
 			0, 0 );
-#endif
 
 		return( 0 );
 	}
 
-	if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
-		== NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-			   "dn2id: couldn't open dn2id%s\n", LDBM_SUFFIX ));
-#else
+	db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT );
+	if ( db == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "<= dn2id could not open dn2id%s\n",
 			LDBM_SUFFIX, 0, 0 );
-#endif
 		/*
 		 * return code !0 if ldbm cache open failed;
 		 * callers should handle this
@@ -167,9 +147,13 @@ dn2id(
 
 	ldbm_datum_init( key );
 
-	key.dsize = strlen( dn ) + 2;
+	key.dsize = dn->bv_len + 2;
 	key.dptr = ch_malloc( key.dsize );
-	sprintf( key.dptr, "%c%s", DN_BASE_PREFIX, dn );
+	tmp = (unsigned char *)key.dptr;
+	tmp[0] = DN_BASE_PREFIX;
+	tmp++;
+	AC_MEMCPY( tmp, dn->bv_val, dn->bv_len );
+	tmp[dn->bv_len] = '\0';
 
 	data = ldbm_cache_fetch( db, key );
 
@@ -178,12 +162,7 @@ dn2id(
 	free( key.dptr );
 
 	if ( data.dptr == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-			   "dn2id: (%s) NOID\n", dn ));
-#else
 		Debug( LDAP_DEBUG_TRACE, "<= dn2id NOID\n", 0, 0, 0 );
-#endif
 
 		*idp = NOID;
 		return( 0 );
@@ -195,12 +174,7 @@ dn2id(
 
 	ldbm_datum_free( db->dbc_db, data );
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "dn2id: %ld\n", *idp ));
-#else
 	Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", *idp, 0, 0 );
-#endif
 
 	return( 0 );
 }
@@ -208,48 +182,42 @@ dn2id(
 int
 dn2idl(
     Backend	*be,
-    const char	*dn,
+    struct berval	*dn,
     int		prefix,
     ID_BLOCK    **idlp
 )
 {
 	DBCache	*db;
 	Datum		key;
+	unsigned char	*tmp;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "dn2idl: \"%c%s\"\n", prefix, dn ));
-#else
-	Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn, 0 );
-#endif
+	Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn->bv_val, 0 );
 
 	assert( idlp != NULL );
 	*idlp = NULL;
 
 	if ( prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn) ) {
-		*idlp = ch_malloc( sizeof(ID) );
-		**idlp = ID_BLOCK_ALLIDS_VALUE;
+		*idlp = idl_allids( be );
 		return 0;
 	}
 
-	if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
-		== NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-			   "dn2idl: could not open dn2id%s\n", LDBM_SUFFIX ));
-#else
+	db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT );
+	if ( db == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "<= dn2idl could not open dn2id%s\n",
 			LDBM_SUFFIX, 0, 0 );
-#endif
 
 		return -1;
 	}
 
 	ldbm_datum_init( key );
 
-	key.dsize = strlen( dn ) + 2;
+	key.dsize = dn->bv_len + 2;
 	key.dptr = ch_malloc( key.dsize );
-	sprintf( key.dptr, "%c%s", prefix, dn );
+	tmp = (unsigned char *)key.dptr;
+	tmp[0] = prefix;
+	tmp++;
+	AC_MEMCPY( tmp, dn->bv_val, dn->bv_len );
+	tmp[dn->bv_len] = '\0';
 
 	*idlp = idl_fetch( be, db, key );
 
@@ -264,94 +232,78 @@ dn2idl(
 int
 dn2id_delete(
     Backend	*be,
-    const char	*dn,
+    struct berval *dn,
 	ID id
 )
 {
 	DBCache	*db;
 	Datum		key;
 	int		rc;
-	char		*buf, *ptr, *pdn;
+	char		*buf;
+	struct berval	ptr, pdn;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "dn2id_delete: (%s)%ld\n", dn, id ));
-#else
-	Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn, id, 0 );
-#endif
+	Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn->bv_val, id, 0 );
 
 
 	assert( id != NOID );
 
-	if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
-	    == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-			   "dn2id_delete: couldn't open db2id%s\n", LDBM_SUFFIX ));
-#else
+	db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT );
+	if ( db == NULL ) {
 		Debug( LDAP_DEBUG_ANY,
 		    "<= dn2id_delete could not open dn2id%s\n", LDBM_SUFFIX,
 		    0, 0 );
-#endif
 
 		return( -1 );
 	}
 
 	ldbm_datum_init( key );
-	key.dsize = strlen( dn ) + 2;
+	key.dsize = dn->bv_len + 2;
 	buf = ch_malloc( key.dsize );
 	key.dptr = buf;
 	buf[0] = DN_BASE_PREFIX;
-	ptr = buf + 1;
-	strcpy( ptr, dn );
+	ptr.bv_val = buf + 1;
+	ptr.bv_len = dn->bv_len;
+	AC_MEMCPY( ptr.bv_val, dn->bv_val, dn->bv_len );
+	ptr.bv_val[dn->bv_len] = '\0';
 
 	rc = ldbm_cache_delete( db, key );
 	
-	if( !be_issuffix( be, ptr )) {
+	if( !be_issuffix( be, &ptr )) {
 		buf[0] = DN_SUBTREE_PREFIX;
 		ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
 		(void) idl_delete_key( be, db, key, id );
 		ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
-	}
 
-	pdn = dn_parent( be, ptr );
+		dnParent( &ptr, &pdn );
 
-	if( pdn != NULL ) {
-		pdn[-1] = DN_ONE_PREFIX;
-		key.dsize -= pdn - ptr;
-		key.dptr = pdn - 1;
+		pdn.bv_val[-1] = DN_ONE_PREFIX;
+		key.dsize = pdn.bv_len + 2;
+		key.dptr = pdn.bv_val - 1;
+		ptr = pdn;
 
 		ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
 		(void) idl_delete_key( be, db, key, id );
 		ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
 	}
 
-	while ( pdn != NULL ) {
-		if ( be_issuffix( be, pdn ))
-			break;
-
-		pdn[-1] = DN_SUBTREE_PREFIX;
+	while ( rc != -1 && !be_issuffix( be, &ptr )) {
+		ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
 		ldap_pvt_thread_mutex_lock( &db->dbc_write_mutex );
 		(void) idl_delete_key( be, db, key, id );
 		ldap_pvt_thread_mutex_unlock( &db->dbc_write_mutex );
 
+		dnParent( &ptr, &pdn );
+		key.dsize = pdn.bv_len + 2;
+		key.dptr = pdn.bv_val - 1;
 		ptr = pdn;
-		pdn = dn_parent( be, pdn );
-		key.dsize -= pdn - ptr;
-		key.dptr = pdn - 1;
 	}
 
 	free( buf );
 
 	ldbm_cache_close( be, db );
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "dn2id_delete: return %d\n", rc ));
-#else
 	Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
-#endif
 
 	return( rc );
 }
@@ -364,23 +316,17 @@ dn2id_delete(
 Entry *
 dn2entry_rw(
     Backend	*be,
-    const char	*dn,
+    struct berval *dn,
     Entry	**matched,
     int		rw
 )
 {
 	ID		id;
 	Entry		*e = NULL;
-	char		*pdn;
+	struct berval	pdn;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "dn2entry_rw: %s entry %s\n", rw ? "w" : "r",
-		   dn ));
-#else
 	Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
-		rw ? "w" : "r", dn, 0);
-#endif
+		rw ? "w" : "r", dn->bv_val, 0);
 
 
 	if( matched != NULL ) {
@@ -392,21 +338,17 @@ dn2entry_rw(
 		/* something bad happened to ldbm cache */
 		return( NULL );
 
-	} else if ( id != NOID ) {
+	}
+	
+	if ( id != NOID ) {
 		/* try to return the entry */
 		if ((e = id2entry_rw( be, id, rw )) != NULL ) {
 			return( e );
 		}
 
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-			   "dn2entry_rw: no entry for valid id (%ld), dn (%s)\n",
-			   id, dn ));
-#else
 		Debug(LDAP_DEBUG_ANY,
 			"dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",
-			rw ? "w" : "r", id, dn);
-#endif
+			rw ? "w" : "r", id, dn->bv_val);
 
 		/* must have been deleted from underneath us */
 		/* treat as if NOID was found */
@@ -416,10 +358,10 @@ dn2entry_rw(
 	if( matched == NULL ) return NULL;
 
 	/* entry does not exist - see how much of the dn does exist */
-	/* dn_parent checks returns NULL if dn is suffix */
-	if ( (pdn = dn_parent( be, dn )) != NULL ) {
+	if ( !be_issuffix( be, dn ) && (dnParent( dn, &pdn ), pdn.bv_len) ) {
 		/* get entry with reader lock */
-		if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
+		if ((e = dn2entry_r( be, &pdn, matched )) != NULL )
+		{
 			*matched = e;
 		}
 	}