]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldbm/dn2id.c
refuse illegal values for "threads" (ITS#4433)
[openldap] / servers / slapd / back-ldbm / dn2id.c
index 0a7edac280e7fdb39f8cae9873fa46e4ba828841..93af8de63225735a6212f4acfff62411db11f30a 100644 (file)
 /* dn2id.c - routines to deal with the dn2id index */
+/* $OpenLDAP$ */
+/* 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"
 
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 #include "back-ldbm.h"
 #include "proto-back-ldbm.h"
 
-extern struct dbcache  *ldbm_cache_open();
-extern char            *dn_parent();
-extern Datum           ldbm_cache_fetch();
-
 int
 dn2id_add(
     Backend    *be,
-    char       *dn,
+    struct berval *dn,
     ID         id
 )
 {
        int             rc, flags;
-       struct dbcache  *db;
+       DBCache *db;
        Datum           key, data;
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+       char            *buf;
+       struct berval   ptr, pdn;
 
-#ifdef LDBM_USE_DB2
-       memset( &key, 0, sizeof( key ) );
-       memset( &data, 0, sizeof( data ) );
-#endif
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn->bv_val, id, 0 );
 
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
+       assert( id != NOID );
 
-       if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
-           == NULL ) {
+       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 );
+
                return( -1 );
        }
 
-       dn = strdup( dn );
-       dn_normalize_case( dn );
-
-       key.dptr = dn;
-       key.dsize = strlen( dn ) + 1;
+       ldbm_datum_init( key );
+       key.dsize = dn->bv_len + 2;
+       buf = ch_malloc( key.dsize );
+       key.dptr = buf;
+       buf[0] = DN_BASE_PREFIX;
+       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;
        data.dsize = sizeof(ID);
 
        flags = LDBM_INSERT;
-       if ( li->li_flush_wrt ) flags |= LDBM_SYNC;
-
        rc = ldbm_cache_store( db, key, data, flags );
 
-       free( dn );
+       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 ) {
+                       dnParent( &ptr, &pdn );
+
+                       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 && !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;
+       }
+
+       free( buf );
        ldbm_cache_close( be, db );
 
        Debug( LDAP_DEBUG_TRACE, "<= dn2id_add %d\n", rc, 0, 0 );
+
        return( rc );
 }
 
-ID
+int
 dn2id(
     Backend    *be,
-    char       *dn
+    struct berval *dn,
+    ID          *idp
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       struct dbcache  *db;
-       ID              id;
+       DBCache *db;
        Datum           key, data;
+       unsigned char   *tmp;
 
-#ifdef LDBM_USE_DB2
-       memset( &key, 0, sizeof( key ) );
-       memset( &data, 0, sizeof( data ) );
-#endif
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
 
-       dn = strdup( dn );
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
-       dn_normalize_case( dn );
+       assert( idp != NULL );
 
        /* first check the cache */
-       if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
-               free( dn );
-               Debug( LDAP_DEBUG_TRACE, "<= dn2id %d (in cache)\n", id,
+       *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 );
-               return( id );
+
+               return( 0 );
        }
 
-       if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
-               == NULL ) {
-               free( dn );
+       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 );
-               return( NOID );
+               /*
+                * return code !0 if ldbm cache open failed;
+                * callers should handle this
+                */
+               *idp = NOID;
+               return( -1 );
        }
 
-       key.dptr = dn;
-       key.dsize = strlen( dn ) + 1;
+       ldbm_datum_init( key );
+
+       key.dsize = dn->bv_len + 2;
+       key.dptr = ch_malloc( key.dsize );
+       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 );
 
        ldbm_cache_close( be, db );
-       free( dn );
+
+       free( key.dptr );
 
        if ( data.dptr == NULL ) {
                Debug( LDAP_DEBUG_TRACE, "<= dn2id NOID\n", 0, 0, 0 );
-               return( NOID );
+
+               *idp = NOID;
+               return( 0 );
        }
 
-       (void) memcpy( (char *) &id, data.dptr, sizeof(ID) );
+       AC_MEMCPY( (char *) idp, data.dptr, sizeof(ID) );
+
+       assert( *idp != NOID );
 
        ldbm_datum_free( db->dbc_db, data );
 
-       Debug( LDAP_DEBUG_TRACE, "<= dn2id %d\n", id, 0, 0 );
-       return( id );
+       Debug( LDAP_DEBUG_TRACE, "<= dn2id %ld\n", *idp, 0, 0 );
+
+       return( 0 );
 }
 
+int
+dn2idl(
+    Backend    *be,
+    struct berval      *dn,
+    int                prefix,
+    ID_BLOCK    **idlp
+)
+{
+       DBCache *db;
+       Datum           key;
+       unsigned char   *tmp;
+
+       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 = idl_allids( be );
+               return 0;
+       }
+
+       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 );
+
+               return -1;
+       }
+
+       ldbm_datum_init( key );
+
+       key.dsize = dn->bv_len + 2;
+       key.dptr = ch_malloc( key.dsize );
+       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 );
+
+       ldbm_cache_close( be, db );
+
+       free( key.dptr );
+
+       return( 0 );
+}
+
+
 int
 dn2id_delete(
     Backend    *be,
-    char       *dn
+    struct berval *dn,
+       ID id
 )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       struct dbcache  *db;
+       DBCache *db;
        Datum           key;
        int             rc;
+       char            *buf;
+       struct berval   ptr, pdn;
 
-#ifdef LDBM_USE_DB2
-       memset( &key, 0, sizeof( key ) );
-#endif
+       Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\", %ld )\n", dn->bv_val, id, 0 );
 
-       Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\" )\n", dn, 0, 0 );
 
-       if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
-           == NULL ) {
+       assert( id != NOID );
+
+       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 );
+
                return( -1 );
        }
 
-       dn_normalize_case( dn );
-       key.dptr = dn;
-       key.dsize = strlen( dn ) + 1;
+       ldbm_datum_init( key );
+       key.dsize = dn->bv_len + 2;
+       buf = ch_malloc( key.dsize );
+       key.dptr = buf;
+       buf[0] = DN_BASE_PREFIX;
+       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 )) {
+               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 );
+
+               dnParent( &ptr, &pdn );
+
+               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 ( 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;
+       }
+
+       free( buf );
 
        ldbm_cache_close( be, db );
 
        Debug( LDAP_DEBUG_TRACE, "<= dn2id_delete %d\n", rc, 0, 0 );
+
        return( rc );
 }
 
@@ -157,81 +313,59 @@ dn2id_delete(
  * entry.
  */
 
-static Entry *
-dn2entry(
+Entry *
+dn2entry_rw(
     Backend    *be,
-    char       *dn,
-    char       **matched,
-    int         rw
+    struct berval *dn,
+    Entry      **matched,
+    int                rw
 )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        ID              id;
-       Entry           *e;
-       char            *pdn;
+       Entry           *e = NULL;
+       struct berval   pdn;
 
-       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: %s\n",
-               rw ? "w" : "r", dn, 0);
+       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: \"%s\"\n",
+               rw ? "w" : "r", dn->bv_val, 0);
 
-       if ( (id = dn2id( be, dn )) != NOID &&
-               (e = id2entry( be, id, rw )) != NULL )
-       {
-               return( e );
+
+       if( matched != NULL ) {
+               /* caller cares about match */
+               *matched = NULL;
        }
-       *matched = NULL;
 
-       /* stop when we get to the suffix */
-       if ( be_issuffix( be, dn ) ) {
+       if ( dn2id( be, dn, &id ) ) {
+               /* something bad happened to ldbm cache */
                return( NULL );
-       }
 
-       /* entry does not exist - see how much of the dn does exist */
-       if ( (pdn = dn_parent( be, dn )) != NULL ) {
-               /* get entry with reader lock */
-               if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
-                       *matched = pdn;
-                       /* free entry with reader lock */
-                       cache_return_entry_r( &li->li_cache, e );
-               } else {
-                       free( pdn );
-               }
        }
+       
+       if ( id != NOID ) {
+               /* try to return the entry */
+               if ((e = id2entry_rw( be, id, rw )) != NULL ) {
+                       return( e );
+               }
 
-       return( NULL );
-}
+               Debug(LDAP_DEBUG_ANY,
+                       "dn2entry_%s: no entry for valid id (%ld), dn \"%s\"\n",
+                       rw ? "w" : "r", id, dn->bv_val);
 
-#if 0
-               if (e->e_state == ENTRY_STATE_DELETED)
-                       continue;
+               /* must have been deleted from underneath us */
+               /* treat as if NOID was found */
+       }
 
-               if (strcmp(dn, e->e_dn) != 0)
-                       continue;
+       /* caller doesn't care about match */
+       if( matched == NULL ) return NULL;
 
-               /* return locked entry entry */
-               return(e);
+       /* 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 )
+               {
+                       *matched = e;
+               }
        }
-}
-#endif
 
-Entry *
-dn2entry_r(
-       Backend *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 0 ) );
-}
-
-Entry *
-dn2entry_w(
-       Backend *be,
-       char    *dn,
-       char    **matched
-)
-{
-       return( dn2entry( be, dn, matched, 1 ) );
+       return NULL;
 }
 
-
-