/* tools.c - tools for slap tools */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 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-2005 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"
== NULL ) {
Debug( LDAP_DEBUG_ANY, "Could not open/create id2entry" LDBM_SUFFIX "\n",
0, 0, 0 );
+
return( -1 );
}
return NOID;
}
- memcpy( &id, key.dptr, key.dsize );
+ AC_MEMCPY( &id, key.dptr, key.dsize );
+#ifndef WORDS_BIGENDIAN
+ id = ntohl( id );
+#endif
ldbm_datum_free( id2entry->dbc_db, key );
return NOID;
}
- memcpy( &id, key.dptr, key.dsize );
+ 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 );
e = str2entry( data.dptr );
ldbm_datum_free( id2entry->dbc_db, data );
+ if( e != NULL ) {
+ e->e_id = id;
+ }
+
return e;
}
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};
+ Opheader ohdr = {0};
assert( slapMode & SLAP_TOOL_MODE );
assert( id2entry != NULL );
- if( next_id_get( be ) == NOID ) {
+ 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;
}
Debug( LDAP_DEBUG_TRACE, "=> ldbm_tool_entry_put( %ld, \"%s\" )\n",
e->e_id, e->e_dn, 0 );
- rc = index_add_entry( be, e );
+ 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( rc != 0 ) {
+ if( id != NOID ) {
+ Debug( LDAP_DEBUG_TRACE,
+ "<= ldbm_tool_entry_put: \"%s\" already exists (id=%ld)\n",
+ e->e_ndn, id, 0 );
+ strncpy( text->bv_val, "already exists", text->bv_len );
return NOID;
}
- rc = dn2id_add( be, e->e_ndn, e->e_id );
+ op.o_hdr = &ohdr;
+ 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_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;
}
return e->e_id;
}
-int ldbm_tool_index_attr(
+int ldbm_tool_entry_reindex(
BackendDB *be,
- char* type )
+ ID id )
{
- static DBCache *db = NULL;
- int indexmask;
- char * at_cn;
-#ifndef SLAPD_SCHEMA_COMPAT
- AttributeType *at;
-#endif
+ int rc;
+ Entry *e;
+ Operation op = {0};
+ Opheader ohdr = {0};
- assert( slapMode & SLAP_TOOL_MODE );
+ Debug( LDAP_DEBUG_ARGS, "=> ldbm_tool_entry_reindex( %ld )\n",
+ (long) id, 0, 0 );
-#ifdef SLAPD_SCHEMA_COMPAT
- attr_normalize( type );
- at_cn = at_canonical_name( type );
- if( at_cn ) {
- Debug( LDAP_DEBUG_ANY, "<= index_attr NULL (attribute type %s has no canonical name)\n",
- type, 0, 0 );
- return 0;
- }
-#else
- at = at_find( type );
+ e = ldbm_tool_entry_get( be, id );
- if( at == NULL ) {
+ if( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "<= index_attr NULL (could not find attribute type %s)\n",
- type, 0, 0 );
- return 0;
- }
-
- at_cn = at_canonical_name( at );
+ "ldbm_tool_entry_reindex:: could not locate id=%ld\n",
+ (long) id, 0, 0 );
- if( at_cn ) {
- Debug( LDAP_DEBUG_ANY, "<= index_attr NULL (attribute type %s (%s) has no canonical name)\n",
- at->sat_oid, type, 0 );
- return 0;
+ return -1;
}
-#endif
- attr_mask( be->be_private, at_cn, &indexmask );
+ /*
+ * just (re)add them for now
+ * assume that some other routine (not yet implemented)
+ * will zap index databases
+ *
+ */
- if ( (db = ldbm_cache_open( be, at_cn, LDBM_SUFFIX, LDBM_NEWDB ))
- == NULL )
- {
- Debug( LDAP_DEBUG_ANY,
- "<= index_attr NULL (could not open %s%s)\n", at_cn,
- LDBM_SUFFIX, 0 );
- return 0;
- }
+ Debug( LDAP_DEBUG_TRACE, "=> ldbm_tool_entry_reindex( %ld, \"%s\" )\n",
+ id, e->e_dn, 0 );
- ldbm_cache_close( be, db );
+ dn2id_add( be, &e->e_nname, e->e_id );
- return indexmask != 0;
-}
+ op.o_hdr = &ohdr;
+ op.o_bd = be;
+ op.o_tmpmemctx = NULL;
+ op.o_tmpmfuncs = &ch_mfuncs;
+ rc = index_entry_add( &op, e );
-int ldbm_tool_index_change(
- BackendDB *be,
- char* type,
- struct berval **bv,
- ID id,
- int op )
-{
- assert( slapMode & SLAP_TOOL_MODE );
+ entry_free( e );
- index_change_values( be,
- type, bv, id, op );
-
- return 0;
+ return rc;
}
int ldbm_tool_sync( BackendDB *be )
assert( slapMode & SLAP_TOOL_MODE );
if ( li->li_nextid != NOID ) {
- next_id_write( be, li->li_nextid );
+ if ( next_id_write( be, li->li_nextid ) ) {
+ return( -1 );
+ }
}
return 0;