Very crude LDIF changes:

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 726eaf675fb599d503f907d3799216b2b1a8f99f..e0465230e95cb4f072292a9d574c1b7737801ad9 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 
 #include <ac/ctype.h>
+#include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 
@@ -17,7 +18,7 @@ static int            emaxsize;/* max size of ebuf                     */
 Entry *
 str2entry( char        *s )
 {
-       int             i;
+       int                     id = 0;
        Entry           *e;
        Attribute       **a;
        char            *type;
@@ -46,14 +47,10 @@ str2entry( char     *s )
        Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
                s ? s : "NULL", 0, 0 );
 
-       e = (Entry *) ch_calloc( 1, sizeof(Entry) );
-       /* initialize reader/writer lock */
-       entry_rdwr_init(e);
-
        /* check to see if there's an id included */
        next = s;
-       if ( isdigit( *s ) ) {
-               e->e_id = atoi( s );
+       if ( isdigit( (unsigned char) *s ) ) {
+               id = atoi( s );
                if ( (s = ldif_getline( &next )) == NULL ) {
                        Debug( LDAP_DEBUG_TRACE,
                            "<= str2entry NULL (missing newline after id)\n",
@@ -62,6 +59,19 @@ str2entry( char      *s )
                }
        }
 
+       /* initialize reader/writer lock */
+       e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+
+       if( e == NULL ) {
+               Debug( LDAP_DEBUG_TRACE,
+                   "<= str2entry NULL (entry allocation failed)\n",
+                   0, 0, 0 );
+               return( NULL );
+       }
+
+       e->e_id = id;
+       e->e_private = NULL;
+
        /* dn + attributes */
        e->e_attrs = NULL;
        vals[0] = &bval;
@@ -84,14 +94,24 @@ str2entry( char     *s )
                        maxvals = 0;
                        a = NULL;
                }
+
                if ( strcasecmp( type, "dn" ) == 0 ) {
                        if ( e->e_dn != NULL ) {
                                Debug( LDAP_DEBUG_ANY,
- "str2entry: entry %lu has multiple dns \"%s\" and \"%s\" (second ignored)\n",
+ "str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n",
                                    e->e_id, e->e_dn, value );
                                continue;
                        }
                        e->e_dn = ch_strdup( value );
+
+                       if ( e->e_ndn != NULL ) {
+                               Debug( LDAP_DEBUG_ANY,
+ "str2entry: entry %ld already has a normalized dn \"%s\" for \"%s\" (first ignored)\n",
+                                   e->e_id, e->e_ndn, value );
+                               free( e->e_ndn );
+                       }
+                       e->e_ndn = ch_strdup( value );
+                       (void) dn_normalize_case( e->e_ndn );
                        continue;
                }
 
@@ -101,6 +121,7 @@ str2entry( char     *s )
                    != 0 ) {
                        Debug( LDAP_DEBUG_TRACE,
                            "<= str2entry NULL (attr_merge)\n", 0, 0, 0 );
+                       entry_free( e );
                        return( NULL );
                }
                nvals++;
@@ -108,13 +129,22 @@ str2entry( char   *s )
 
        /* check to make sure there was a dn: line */
        if ( e->e_dn == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "str2entry: entry %lu has no dn\n",
+               Debug( LDAP_DEBUG_ANY, "str2entry: entry %ld has no dn\n",
                    e->e_id, 0, 0 );
                entry_free( e );
                return( NULL );
        }
 
-       Debug(LDAP_DEBUG_TRACE, "<= str2entry 0x%lx\n", (unsigned long)e, 0,0);
+       if ( e->e_ndn == NULL ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "str2entry: entry %ld (\"%s\") has no normalized dn\n",
+                   e->e_id, e->e_dn, 0 );
+               entry_free( e );
+               return( NULL );
+       }
+
+       Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> %ld (0x%lx)\n",
+               e->e_dn, e->e_id, (unsigned long)e );
 
        return( e );
 }
@@ -188,73 +218,54 @@ entry2str(
 void
 entry_free( Entry *e )
 {
-       int             i;
        Attribute       *a, *next;
 
-       /* XXX check that no reader/writer locks exist */
-#ifdef LDAP_DEBUG
-       assert( !pthread_rdwr_wchk_np(&e->e_rdwr) &&
-               !pthread_rdwr_rchk_np(&e->e_rdwr) );
-#endif
-
        if ( e->e_dn != NULL ) {
                free( e->e_dn );
+               e->e_dn = NULL;
+       }
+       if ( e->e_ndn != NULL ) {
+               free( e->e_ndn );
+               e->e_ndn = NULL;
        }
        for ( a = e->e_attrs; a != NULL; a = next ) {
                next = a->a_next;
                attr_free( a );
        }
+       e->e_attrs = NULL;
+       e->e_private = NULL;
        free( e );
 }
 
-int
-entry_rdwr_lock(Entry *e, int rw)
-{
-       Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%slock: ID: %ld\n",
-               rw ? "w" : "r", e->e_id, 0);
-       if (rw)
-               return pthread_rdwr_wlock_np(&e->e_rdwr);
-       else
-               return pthread_rdwr_rlock_np(&e->e_rdwr);
-}
+/*
+ * These routines are used only by Backend.
+ *
+ * the Entry has three entry points (ways to find things):
+ *
+ *     by entry        e.g., if you already have an entry from the cache
+ *                     and want to delete it. (really by entry ptr)
+ *     by dn           e.g., when looking for the base object of a search
+ *     by id           e.g., for search candidates
+ *
+ * these correspond to three different avl trees that are maintained.
+ */
 
 int
-entry_rdwr_rlock(Entry *e)
+entry_cmp( Entry *e1, Entry *e2 )
 {
-       return entry_rdwr_lock( e, 0 );
+       return( e1 < e2 ? -1 : (e1 > e2 ? 1 : 0) );
 }
 
 int
-entry_rdwr_wlock(Entry *e)
+entry_dn_cmp( Entry *e1, Entry *e2 )
 {
-       return entry_rdwr_lock( e, 1 );
+       /* compare their normalized UPPERCASED dn's */
+       return( strcmp( e1->e_ndn, e2->e_ndn ) );
 }
 
 int
-entry_rdwr_unlock(Entry *e, int rw)
+entry_id_cmp( Entry *e1, Entry *e2 )
 {
-       Debug( LDAP_DEBUG_ARGS, "entry_rdwr_%sunlock: ID: %ld\n",
-               rw ? "w" : "r", e->e_id, 0);
-       if (rw)
-               return pthread_rdwr_wunlock_np(&e->e_rdwr);
-       else
-               return pthread_rdwr_runlock_np(&e->e_rdwr);
+       return( e1->e_id < e2->e_id ? -1 : (e1->e_id > e2->e_id ? 1 : 0) );
 }
 
-int
-entry_rdwr_runlock(Entry *e)
-{
-       return entry_rdwr_unlock( e, 0 );
-}
-
-int
-entry_rdwr_wunlock(Entry *e)
-{
-       return entry_rdwr_unlock( e, 1 );
-}
-
-int
-entry_rdwr_init(Entry *e)
-{
-       return pthread_rdwr_init_np(&e->e_rdwr, NULL);
-}