place old schema codes behind -DSLAPD_SCHEMA_COMPAT

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index d58b4a70931b07a894b68c9b70bbcccda51eed8a..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
@@ -19,10 +20,18 @@ static unsigned char        *ebuf;  /* buf returned by entry2str             */
 static unsigned char   *ecur;  /* pointer to end of currently used ebuf */
 static int             emaxsize;/* max size of ebuf                     */
 
+int entry_destroy(void)
+{
+       free( ebuf );
+       ebuf = NULL;
+       ecur = NULL;
+       emaxsize = 0;
+       return 0;
+}
+
 Entry *
-str2entry( char        *s )
+str2entry( char *s )
 {
-       int                     id = 0;
        Entry           *e;
        Attribute       **a;
        char            *type;
@@ -35,9 +44,9 @@ str2entry( char       *s )
        char            ptype[64];
 
        /*
-        * In string format, an entry looks like this:
+        * LDIF is used as the string format.
+        * An entry looks like this:
         *
-        *      <id>\n
         *      dn: <dn>\n
         *      [<attr>:[:] <value>\n]
         *      [<tab><continuedvalue>\n]*
@@ -52,20 +61,10 @@ str2entry( char     *s )
        Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
                s ? s : "NULL", 0, 0 );
 
-       /* check to see if there's an id included */
        next = 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",
-                           0, 0, 0 );
-                       return( NULL );
-               }
-       }
 
        /* initialize reader/writer lock */
-       e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+       e = (Entry *) ch_malloc( sizeof(Entry) );
 
        if( e == NULL ) {
                Debug( LDAP_DEBUG_TRACE,
@@ -74,14 +73,18 @@ str2entry( char     *s )
                return( NULL );
        }
 
-       e->e_id = id;
+       /* 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;
@@ -101,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;
                }
 
@@ -129,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++;
        }
 
@@ -142,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 );
@@ -160,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 ); \
@@ -172,9 +169,7 @@ str2entry( char     *s )
 char *
 entry2str(
     Entry      *e,
-    int                *len,
-    int                printid
-)
+    int                *len )
 {
        Attribute       *a;
        struct berval   *bv;
@@ -189,13 +184,6 @@ entry2str(
 
        ecur = ebuf;
 
-       if ( printid ) {
-               /* id + newline */
-               MAKE_SPACE( 10 );
-               sprintf( (char *) ecur, "%ld\n", e->e_id );
-               ecur = (unsigned char *) strchr( (char *) ecur, '\0' );
-       }
-
        /* put the dn */
        if ( e->e_dn != NULL ) {
                /* put "dn: <dn>" */