X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fdn2id.c;h=93af8de63225735a6212f4acfff62411db11f30a;hb=324431062bff39a1bd3969bd37d4913526dd583f;hp=491723fe47471b14accc103c0a2aaa3bef77a459;hpb=6939c531700652491f4be4688c6a1f35a1ab8a18;p=openldap
diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 491723fe47..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-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * 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
+ * .
*/
#include "portable.h"
@@ -29,23 +38,14 @@ dn2id_add(
char *buf;
struct berval ptr, pdn;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ENTRY, "dn2id_add: (%s):%ld\n", dn->bv_val, id, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn->bv_val, id, 0 );
-#endif
assert( id != NOID );
db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT );
if ( db == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "dn2id_add: couldn't open/create dn2id%s\n", LDBM_SUFFIX, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "Could not open/create dn2id%s\n",
LDBM_SUFFIX, 0, 0 );
-#endif
return( -1 );
}
@@ -103,11 +103,7 @@ dn2id_add(
free( buf );
ldbm_cache_close( be, db );
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ENTRY, "dn2id_add: return %d\n", rc, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id_add %d\n", rc, 0, 0 );
-#endif
return( rc );
}
@@ -124,36 +120,23 @@ dn2id(
Datum key, data;
unsigned char *tmp;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ENTRY, "dn2id: (%s)\n", dn->bv_val, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
-#endif
- assert( idp );
+ assert( idp != NULL );
/* first check the cache */
*idp = cache_find_entry_ndn2id( be, &li->li_cache, dn );
if ( *idp != NOID ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, DETAIL1, "dn2id: (%s)%ld in cache.\n", dn, *idp, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld (in cache)\n", *idp,
0, 0 );
-#endif
return( 0 );
}
db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT );
if ( db == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "dn2id: couldn't open dn2id%s\n", LDBM_SUFFIX, 0, 0 );
-#else
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
@@ -179,11 +162,7 @@ dn2id(
free( key.dptr );
if ( data.dptr == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, INFO, "dn2id: (%s) NOID\n", dn, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id NOID\n", 0, 0, 0 );
-#endif
*idp = NOID;
return( 0 );
@@ -195,11 +174,7 @@ dn2id(
ldbm_datum_free( db->dbc_db, data );
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ENTRY, "dn2id: %ld\n", *idp, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", *idp, 0, 0 );
-#endif
return( 0 );
}
@@ -216,11 +191,7 @@ dn2idl(
Datum key;
unsigned char *tmp;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ENTRY, "dn2idl: \"%c%s\"\n", prefix, dn->bv_val, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "=> dn2idl( \"%c%s\" )\n", prefix, dn->bv_val, 0 );
-#endif
assert( idlp != NULL );
*idlp = NULL;
@@ -232,13 +203,8 @@ dn2idl(
db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT );
if ( db == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "dn2idl: could not open dn2id%s\n", LDBM_SUFFIX, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "<= dn2idl could not open dn2id%s\n",
LDBM_SUFFIX, 0, 0 );
-#endif
return -1;
}
@@ -276,26 +242,16 @@ dn2id_delete(
char *buf;
struct berval ptr, pdn;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ENTRY,
- "dn2id_delete: (%s)%ld\n", dn->bv_val, id, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn->bv_val, id, 0 );
-#endif
assert( id != NOID );
db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT );
if ( db == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "dn2id_delete: couldn't open db2id%s\n", LDBM_SUFFIX, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"<= dn2id_delete could not open dn2id%s\n", LDBM_SUFFIX,
0, 0 );
-#endif
return( -1 );
}
@@ -347,11 +303,7 @@ dn2id_delete(
ldbm_cache_close( be, db );
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ENTRY, "dn2id_delete: return %d\n", rc, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
-#endif
return( rc );
}
@@ -373,13 +325,8 @@ dn2entry_rw(
Entry *e = NULL;
struct berval pdn;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ENTRY,
- "dn2entry_rw: %s entry %s\n", rw ? "w" : "r", dn->bv_val, 0 );
-#else
Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
rw ? "w" : "r", dn->bv_val, 0);
-#endif
if( matched != NULL ) {
@@ -399,15 +346,9 @@ dn2entry_rw(
return( e );
}
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDBM, ERR,
- "dn2entry_rw: no entry for valid id (%ld), dn (%s)\n",
- id, dn->bv_val, 0 );
-#else
Debug(LDAP_DEBUG_ANY,
"dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",
rw ? "w" : "r", id, dn->bv_val);
-#endif
/* must have been deleted from underneath us */
/* treat as if NOID was found */
@@ -419,7 +360,8 @@ dn2entry_rw(
/* entry does not exist - see how much of the dn does exist */
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;
}
}