/* tools.c - tools for slap tools */
/* $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-2003 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"
if ( (id2entry = ldbm_cache_open( be, "id2entry", LDBM_SUFFIX, flags ))
== NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
- "Could not open/create id2entry%s\n", LDBM_SUFFIX ));
+ LDAP_LOG( BACK_LDBM, CRIT,
+ "Could not open/create id2entry%s\n", LDBM_SUFFIX, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "Could not open/create id2entry" LDBM_SUFFIX "\n",
0, 0, 0 );
}
AC_MEMCPY( &id, key.dptr, key.dsize );
+#ifndef WORDS_BIGENDIAN
+ id = ntohl( id );
+#endif
ldbm_datum_free( id2entry->dbc_db, key );
}
AC_MEMCPY( &id, key.dptr, key.dsize );
+#ifndef WORDS_BIGENDIAN
+ id = ntohl( id );
+#endif
ldbm_datum_free( id2entry->dbc_db, key );
{
Entry *e;
Datum key, data;
+#ifndef WORDS_BIGENDIAN
+ ID id2;
+#endif
assert( slapMode & SLAP_TOOL_MODE );
assert( id2entry != NULL );
ldbm_datum_init( key );
+#ifndef WORDS_BIGENDIAN
+ id2 = htonl( id );
+ key.dptr = (char *) &id2;
+#else
key.dptr = (char *) &id;
+#endif
key.dsize = sizeof(ID);
data = ldbm_cache_fetch( id2entry, key );
ID ldbm_tool_entry_put(
BackendDB *be,
- Entry *e )
+ Entry *e,
+ struct berval *text )
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
Datum key, data;
int rc, len;
ID id;
+ Operation op = {0};
assert( slapMode & SLAP_TOOL_MODE );
assert( id2entry != NULL );
+ assert( text );
+ assert( text->bv_val );
+ assert( text->bv_val[0] == '\0' ); /* overconservative? */
+
if ( next_id_get( be, &id ) || id == NOID ) {
+ strncpy( text->bv_val, "unable to get nextid", text->bv_len );
return NOID;
}
e->e_id = li->li_nextid++;
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_tool_entry_put: (%s)%ld\n", e->e_dn, e->e_id ));
+ LDAP_LOG( BACK_LDBM, ENTRY,
+ "ldbm_tool_entry_put: (%s)%ld\n", e->e_dn, e->e_id ,0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> ldbm_tool_entry_put( %ld, \"%s\" )\n",
e->e_id, e->e_dn, 0 );
#endif
- if ( dn2id( be, e->e_ndn, &id ) ) {
+ if ( dn2id( be, &e->e_nname, &id ) ) {
/* something bad happened to ldbm cache */
+ strncpy( text->bv_val, "ldbm cache corrupted", text->bv_len );
return NOID;
}
if( id != NOID ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+ LDAP_LOG( BACK_LDBM, ENTRY,
"ldbm_tool_entry_put: \"%s\" already exists (id=%ld)\n",
- e->e_dn, id ));
+ e->e_dn, id, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"<= ldbm_tool_entry_put: \"%s\" already exists (id=%ld)\n",
e->e_ndn, id, 0 );
#endif
+ strncpy( text->bv_val, "already exists", text->bv_len );
return NOID;
}
- rc = index_entry_add( be, e, e->e_attrs );
+ op.o_bd = be;
+ op.o_tmpmemctx = NULL;
+ op.o_tmpmfuncs = &ch_mfuncs;
+
+ rc = index_entry_add( &op, e );
if( rc != 0 ) {
+ strncpy( text->bv_val, "index add failed", text->bv_len );
return NOID;
}
- rc = dn2id_add( be, e->e_ndn, e->e_id );
+ rc = dn2id_add( be, &e->e_nname, e->e_id );
if( rc != 0 ) {
+ strncpy( text->bv_val, "dn2id add failed", text->bv_len );
return NOID;
}
ldbm_datum_init( key );
ldbm_datum_init( data );
+#ifndef WORDS_BIGENDIAN
+ id = htonl( e->e_id );
+ key.dptr = (char *) &id;
+#else
key.dptr = (char *) &e->e_id;
+#endif
key.dsize = sizeof(ID);
data.dptr = entry2str( e, &len );
rc = ldbm_cache_store( id2entry, key, data, LDBM_REPLACE );
if( rc != 0 ) {
- (void) dn2id_delete( be, e->e_ndn, e->e_id );
+ (void) dn2id_delete( be, &e->e_nname, e->e_id );
+ strncpy( text->bv_val, "cache store failed", text->bv_len );
return NOID;
}
{
int rc;
Entry *e;
+ Operation op = {0};
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_tool_entry_reindex: ID=%ld\n", (long)id ));
+ LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_tool_entry_reindex: ID=%ld\n",
+ (long)id, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "=> ldbm_tool_entry_reindex( %ld )\n",
(long) id, 0, 0 );
if( e == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_tool_entry_reindex: could not locate id %ld\n",
- (long)id ));
+ LDAP_LOG( BACK_LDBM, INFO,
+ "ldbm_tool_entry_reindex: could not locate id %ld\n",
+ (long)id, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"ldbm_tool_entry_reindex:: could not locate id=%ld\n",
*/
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_tool_entry_reindex: (%s) %ld\n", e->e_dn, id ));
+ LDAP_LOG( BACK_LDBM, ENTRY,
+ "ldbm_tool_entry_reindex: (%s) %ld\n", e->e_dn, id, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "=> ldbm_tool_entry_reindex( %ld, \"%s\" )\n",
id, e->e_dn, 0 );
#endif
- rc = dn2id_add( be, e->e_ndn, e->e_id );
- if( rc == 0 ) {
- rc = index_entry_add( be, e, e->e_attrs );
- }
+ dn2id_add( be, &e->e_nname, e->e_id );
+
+ op.o_bd = be;
+ op.o_tmpmemctx = NULL;
+ op.o_tmpmfuncs = &ch_mfuncs;
+ rc = index_entry_add( &op, e );
entry_free( e );
projects / openldap / blobdiff