Change overlapping `strcpy( x, y )' to `SAFEMEMCPY( x, y, strlen( y ) + 1 )'

[openldap] / servers / slapd / back-ldbm / dn2id.c

diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 45eeec8f10fea9412a5771dc9c902314b8021719..b5ca2a4c7c0d84d61996629d46e5e45c86f1b2bd 100644 (file)
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -1,17 +1,15 @@
 /* dn2id.c - routines to deal with the dn2id index */
 
+#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"
-
-extern struct dbcache  *ldbm_cache_open();
-extern Entry           *cache_find_entry_dn();
-extern Entry           *id2entry();
-extern char            *dn_parent();
-extern Datum           ldbm_cache_fetch();
+#include "proto-back-ldbm.h"
 
 int
 dn2id_add(
@@ -25,6 +23,11 @@ dn2id_add(
        Datum           key, data;
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
+#ifdef HAVE_BERKELEY_DB2
+       memset( &key, 0, sizeof( key ) );
+       memset( &data, 0, sizeof( data ) );
+#endif
+
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
@@ -34,7 +37,7 @@ dn2id_add(
                return( -1 );
        }
 
-       dn = strdup( dn );
+       dn = ch_strdup( dn );
        dn_normalize_case( dn );
 
        key.dptr = dn;
@@ -43,7 +46,7 @@ dn2id_add(
        data.dsize = sizeof(ID);
 
        flags = LDBM_INSERT;
-       if ( li->li_flush_wrt ) flags |= LDBM_SYNC;
+       if ( li->li_dbcachewsync ) flags |= LDBM_SYNC;
 
        rc = ldbm_cache_store( db, key, data, flags );
 
@@ -62,31 +65,31 @@ dn2id(
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        struct dbcache  *db;
-       Entry           *e;
        ID              id;
        Datum           key, data;
 
+#ifdef HAVE_BERKELEY_DB2
+       memset( &key, 0, sizeof( key ) );
+       memset( &data, 0, sizeof( data ) );
+#endif
 
-       dn = strdup( dn );
-       dn_normalize_case( dn );
+       dn = ch_strdup( dn );
        Debug( LDAP_DEBUG_TRACE, "=> dn2id( \"%s\" )\n", dn, 0, 0 );
+       dn_normalize_case( dn );
 
        /* first check the cache */
-       if ( (e = cache_find_entry_dn( &li->li_cache, dn )) != NULL ) {
-               id = e->e_id;
+       if ( (id = cache_find_entry_dn2id( be, &li->li_cache, dn )) != NOID ) {
                free( dn );
-               Debug( LDAP_DEBUG_TRACE, "<= dn2id %d (in cache)\n", e->e_id,
-                   0, 0 );
-               cache_return_entry( &li->li_cache, e );
-
+               Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu (in cache)\n", id,
+                       0, 0 );
                return( id );
        }
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
-           == NULL ) {
+               == NULL ) {
                free( dn );
                Debug( LDAP_DEBUG_ANY, "<= dn2id could not open dn2id%s\n",
-                   LDBM_SUFFIX, 0, 0 );
+                       LDBM_SUFFIX, 0, 0 );
                return( NOID );
        }
 
@@ -107,7 +110,7 @@ dn2id(
 
        ldbm_datum_free( db->dbc_db, data );
 
-       Debug( LDAP_DEBUG_TRACE, "<= dn2id %d\n", id, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "<= dn2id %lu\n", id, 0, 0 );
        return( id );
 }
 
@@ -122,6 +125,10 @@ dn2id_delete(
        Datum           key;
        int             rc;
 
+#ifdef HAVE_BERKELEY_DB2
+       memset( &key, 0, sizeof( key ) );
+#endif
+
        Debug( LDAP_DEBUG_TRACE, "=> dn2id_delete( \"%s\" )\n", dn, 0, 0 );
 
        if ( (db = ldbm_cache_open( be, "dn2id", LDBM_SUFFIX, LDBM_WRCREAT ))
@@ -149,23 +156,29 @@ dn2id_delete(
  * entry.
  */
 
-Entry *
+static Entry *
 dn2entry(
     Backend    *be,
     char       *dn,
-    char       **matched
+    char       **matched,
+    int         rw
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        ID              id;
-       Entry           *e;
+       Entry           *e = NULL;
        char            *pdn;
 
-       if ( (id = dn2id( be, dn )) != NOID && (e = id2entry( be, id ))
-           != NULL ) {
+       Debug(LDAP_DEBUG_TRACE, "dn2entry_%s: dn: %s\n",
+               rw ? "w" : "r", dn, 0);
+
+       *matched = NULL;
+
+       if ( (id = dn2id( be, dn )) != NOID &&
+               (e = id2entry( be, id, rw )) != NULL )
+       {
                return( e );
        }
-       *matched = NULL;
 
        /* stop when we get to the suffix */
        if ( be_issuffix( be, dn ) ) {
@@ -174,9 +187,11 @@ dn2entry(
 
        /* entry does not exist - see how much of the dn does exist */
        if ( (pdn = dn_parent( be, dn )) != NULL ) {
-               if ( (e = dn2entry( be, pdn, matched )) != NULL ) {
+               /* get entry with reader lock */
+               if ( (e = dn2entry_r( be, pdn, matched )) != NULL ) {
                        *matched = pdn;
-                       cache_return_entry( &li->li_cache, e );
+                       /* free entry with reader lock */
+                       cache_return_entry_r( &li->li_cache, e );
                } else {
                        free( pdn );
                }
@@ -184,3 +199,26 @@ dn2entry(
 
        return( NULL );
 }
+
+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 ) );
+}
+
+
+