Per ITS#419, don't require SLAPD_RLOOKUPS when HAVE_TCPD

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 8d6631d536d7369fc4fc1f44dd40f6af057c39cf..b0cd52e28fda5384293f95be943bee64000f0968 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -1,4 +1,5 @@
 /* entry.c - routines for dealing with entries */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -63,7 +64,7 @@ str2entry( char *s )
        next = s;
 
        /* initialize reader/writer lock */
-       e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+       e = (Entry *) ch_malloc( sizeof(Entry) );
 
        if( e == NULL ) {
                Debug( LDAP_DEBUG_TRACE,
@@ -72,14 +73,18 @@ str2entry( char *s )
                return( NULL );
        }
 
+       /* initialize entry */
        e->e_id = NOID;
+       e->e_dn = NULL;
+       e->e_ndn = NULL;
+       e->e_attrs = NULL;
        e->e_private = NULL;
 
        /* dn + attributes */
-       e->e_attrs = NULL;
        vals[0] = &bval;
        vals[1] = NULL;
        ptype[0] = '\0';
+
        while ( (s = ldif_getline( &next )) != NULL ) {
                if ( *s == '\n' || *s == '\0' ) {
                        break;
@@ -99,24 +104,17 @@ str2entry( char *s )
                }
 
                if ( strcasecmp( type, "dn" ) == 0 ) {
+                       free( type );
+
                        if ( e->e_dn != NULL ) {
                                Debug( LDAP_DEBUG_ANY,
  "str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n",
                                    e->e_id, e->e_dn,
                                        value != NULL ? value : NULL );
+                               if( value != NULL ) free( value );
                                continue;
                        }
-                       e->e_dn = ch_strdup( value != NULL ? 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 != NULL ? value : NULL );
-                               free( e->e_ndn );
-                       }
-                       e->e_ndn = ch_strdup( e->e_dn );
-                       (void) dn_normalize_case( e->e_ndn );
+                       e->e_dn = value != NULL ? value : ch_strdup( "" );
                        continue;
                }
 
@@ -127,8 +125,13 @@ str2entry( char *s )
                        Debug( LDAP_DEBUG_TRACE,
                            "<= str2entry NULL (attr_merge)\n", 0, 0, 0 );
                        entry_free( e );
+                       free( value );
+                       free( type );
                        return( NULL );
                }
+
+               free( value );
+               free( type );
                nvals++;
        }
 
@@ -140,13 +143,9 @@ str2entry( char *s )
                return( NULL );
        }
 
-       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 );
-       }
+       /* generate normalized dn */
+       e->e_ndn = ch_strdup( e->e_dn );
+       (void) dn_normalize( e->e_ndn );
 
        Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> %ld (0x%lx)\n",
                e->e_dn, e->e_id, (unsigned long)e );
@@ -158,7 +157,7 @@ str2entry( char *s )
 
 #define MAKE_SPACE( n )        { \
                while ( ecur + (n) > ebuf + emaxsize ) { \
-                       int     offset; \
+                       ptrdiff_t       offset; \
                        offset = (int) (ecur - ebuf); \
                        ebuf = (unsigned char *) ch_realloc( (char *) ebuf, \
                            emaxsize + GRABSIZE ); \