X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-ldbm%2Fid2entry.c;h=00b3a9977408484437ac4ef4de13844e2d5e1f2f;hb=aa3b69eb32f3292340b1af8c7733aafaf6f2f6e5;hp=69a5ceb3dad5f429637fcefb5727bb6e11624b46;hpb=9ee9f1e0e1332b5ca70cd6c61b694eb278fd4173;p=openldap

diff --git a/servers/slapd/back-ldbm/id2entry.c b/servers/slapd/back-ldbm/id2entry.c
index 69a5ceb3da..00b3a99774 100644
--- a/servers/slapd/back-ldbm/id2entry.c
+++ b/servers/slapd/back-ldbm/id2entry.c
@@ -1,7 +1,7 @@
 /* id2entry.c - routines to deal with the id2entry index */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -22,17 +22,18 @@
 int
 id2entry_add( Backend *be, Entry *e )
 {
-	struct ldbminfo	*li = (struct ldbminfo *) be->be_private;
 	DBCache	*db;
 	Datum		key, data;
 	int		len, rc, flags;
+#ifndef WORDS_BIGENDIAN
+	ID		id;
+#endif
 
 	ldbm_datum_init( key );
 	ldbm_datum_init( data );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "id2entry_add: (%s)%ld\n", e->e_dn, e->e_id ));
+	LDAP_LOG( INDEX, ENTRY, "id2entry_add: (%s)%ld\n", e->e_dn, e->e_id, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "=> id2entry_add( %ld, \"%s\" )\n", e->e_id,
 	    e->e_dn, 0 );
@@ -42,9 +43,9 @@ id2entry_add( Backend *be, Entry *e )
 	if ( (db = ldbm_cache_open( be, "id2entry", LDBM_SUFFIX, LDBM_WRCREAT ))
 	    == NULL ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-			   "id2entry_add: could not open/create id2entry%s\n",
-			   LDBM_SUFFIX ));
+		LDAP_LOG( INDEX, ERR, 
+		   "id2entry_add: could not open/create id2entry%s\n", 
+		   LDBM_SUFFIX, 0,0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "Could not open/create id2entry%s\n",
 		    LDBM_SUFFIX, 0, 0 );
@@ -53,7 +54,12 @@ id2entry_add( Backend *be, Entry *e )
 		return( -1 );
 	}
 
+#ifdef WORDS_BIGENDIAN
 	key.dptr = (char *) &e->e_id;
+#else
+	id = htonl(e->e_id);
+	key.dptr = (char *) &id;
+#endif
 	key.dsize = sizeof(ID);
 
 	ldap_pvt_thread_mutex_lock( &entry2str_mutex );
@@ -69,8 +75,7 @@ id2entry_add( Backend *be, Entry *e )
 	ldbm_cache_close( be, db );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "id2entry_add: return %d\n", rc ));
+	LDAP_LOG( INDEX, ENTRY, "id2entry_add: return %d\n", rc, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "<= id2entry_add %d\n", rc, 0, 0 );
 #endif
@@ -86,10 +91,12 @@ id2entry_delete( Backend *be, Entry *e )
 	DBCache	*db;
 	Datum		key;
 	int		rc;
+#ifndef WORDS_BIGENDIAN
+	ID		id;
+#endif
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "id2entry_delete: (%s)%ld\n", e->e_dn, e->e_id ));
+	LDAP_LOG( INDEX, ENTRY, "id2entry_delete: (%s)%ld\n", e->e_dn, e->e_id, 0 );
 #else
 	Debug(LDAP_DEBUG_TRACE, "=> id2entry_delete( %ld, \"%s\" )\n", e->e_id,
 	    e->e_dn, 0 );
@@ -108,9 +115,9 @@ id2entry_delete( Backend *be, Entry *e )
 	if ( (db = ldbm_cache_open( be, "id2entry", LDBM_SUFFIX, LDBM_WRCREAT ))
 		== NULL ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+		LDAP_LOG( INDEX, ERR, 
 			   "id2entry_delete: could not open/create id2entry%s\n",
-			   LDBM_SUFFIX ));
+			   LDBM_SUFFIX, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "Could not open/create id2entry%s\n",
 		    LDBM_SUFFIX, 0, 0 );
@@ -121,9 +128,9 @@ id2entry_delete( Backend *be, Entry *e )
 
 	if ( cache_delete_entry( &li->li_cache, e ) != 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+		LDAP_LOG( INDEX, ERR, 
 			   "id2entry_delete: Could not delete (%s)%ld from cache\n",
-			   e->e_dn, e->e_id ));
+			   e->e_dn, e->e_id, 0 );
 #else
 		Debug(LDAP_DEBUG_ANY, "could not delete %ld (%s) from cache\n",
 		    e->e_id, e->e_dn, 0 );
@@ -131,7 +138,12 @@ id2entry_delete( Backend *be, Entry *e )
 
 	}
 
+#ifdef WORDS_BIGENDIAN
 	key.dptr = (char *) &e->e_id;
+#else
+	id = htonl(e->e_id);
+	key.dptr = (char *) &id;
+#endif
 	key.dsize = sizeof(ID);
 
 	rc = ldbm_cache_delete( db, key );
@@ -139,8 +151,7 @@ id2entry_delete( Backend *be, Entry *e )
 	ldbm_cache_close( be, db );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "id2entry_delete: return %d\n", rc ));
+	LDAP_LOG( INDEX, ENTRY, "id2entry_delete: return %d\n", rc, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "<= id2entry_delete %d\n", rc, 0, 0 );
 #endif
@@ -156,14 +167,16 @@ id2entry_rw( Backend *be, ID id, int rw )
 	DBCache	*db;
 	Datum		key, data;
 	Entry		*e;
+#ifndef WORDS_BIGENDIAN
+	ID		id2;
+#endif
 
 	ldbm_datum_init( key );
 	ldbm_datum_init( data );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "id2entry_rw: %s (%ld)\n",
-		   rw ? "write" : "read", id ));
+	LDAP_LOG( INDEX, ENTRY, 
+		   "id2entry_rw: %s (%ld)\n", rw ? "write" : "read", id, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "=> id2entry_%s( %ld )\n",
 		rw ? "w" : "r", id, 0 );
@@ -172,9 +185,9 @@ id2entry_rw( Backend *be, ID id, int rw )
 
 	if ( (e = cache_find_entry_id( &li->li_cache, id, rw )) != NULL ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+		LDAP_LOG( INDEX, DETAIL1, 
 			   "id2entry_rw: %s (%ld) 0x%lx (cache).\n",
-			   rw ? "write" : "read", id, (unsigned long)e ));
+			   rw ? "write" : "read", id, (unsigned long)e  );
 #else
 		Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) 0x%lx (cache)\n",
 			rw ? "w" : "r", id, (unsigned long) e );
@@ -186,8 +199,8 @@ id2entry_rw( Backend *be, ID id, int rw )
 	if ( (db = ldbm_cache_open( be, "id2entry", LDBM_SUFFIX, LDBM_WRCREAT ))
 		== NULL ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-			   "id2entry_rw: could not open id2entry%s\n", LDBM_SUFFIX ));
+		LDAP_LOG( INDEX, ERR, 
+			   "id2entry_rw: could not open id2entry%s\n", LDBM_SUFFIX, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "Could not open id2entry%s\n",
 		    LDBM_SUFFIX, 0, 0 );
@@ -196,15 +209,20 @@ id2entry_rw( Backend *be, ID id, int rw )
 		return( NULL );
 	}
 
+#ifdef WORDS_BIGENDIAN
 	key.dptr = (char *) &id;
+#else
+	id2 = htonl(id);
+	key.dptr = (char *) &id2;
+#endif
 	key.dsize = sizeof(ID);
 
 	data = ldbm_cache_fetch( db, key );
 
 	if ( data.dptr == NULL ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-			   "id2entry_rw: (%ld) not found\n", id ));
+		LDAP_LOG( INDEX, ERR, 
+			   "id2entry_rw: (%ld) not found\n", id, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) not found\n",
 			rw ? "w" : "r", id, 0 );
@@ -220,9 +238,8 @@ id2entry_rw( Backend *be, ID id, int rw )
 
 	if ( e == NULL ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-			   "id2entry_rw: %s of %ld failed\n",
-			   rw ? "write" : "read", id ));
+		LDAP_LOG( INDEX, ERR, 
+			   "id2entry_rw: %s of %ld failed\n", rw ? "write" : "read", id, 0);
 #else
 		Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) (failed)\n",
 			rw ? "w" : "r", id, 0 );
@@ -242,9 +259,9 @@ id2entry_rw( Backend *be, ID id, int rw )
 		 */
 		if ( (e = cache_find_entry_id( &li->li_cache, id, rw )) != NULL ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+			LDAP_LOG( INDEX, DETAIL1, 
 				   "id2entry_rw: %s of %ld 0x%lx (cache)\n",
-				   rw ? "write" : "read", id, (unsigned long)e ));
+				   rw ? "write" : "read", id, (unsigned long)e  );
 #else
 			Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) 0x%lx (cache)\n",
 				rw ? "w" : "r", id, (unsigned long) e );
@@ -254,9 +271,9 @@ id2entry_rw( Backend *be, ID id, int rw )
 		}
 
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+		LDAP_LOG( INDEX, ERR, 
 			   "id2entry_rw: %s of %ld (cache add failed)\n",
-			   rw ? "write" : "read", id ));
+			   rw ? "write" : "read", id, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) (cache add failed)\n",
 			rw ? "w" : "r", id, 0 );
@@ -266,9 +283,9 @@ id2entry_rw( Backend *be, ID id, int rw )
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+	LDAP_LOG( INDEX, ENTRY, 
 		   "id2entry_rw: %s of %ld 0x%lx (disk)\n",
-		   rw ? "write" : "read", id, (unsigned long)e ));
+		   rw ? "write" : "read", id, (unsigned long)e  );
 #else
 	Debug( LDAP_DEBUG_TRACE, "<= id2entry_%s( %ld ) 0x%lx (disk)\n",
 		rw ? "w" : "r", id, (unsigned long) e );