X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=b0cd52e28fda5384293f95be943bee64000f0968;hb=51190984eefbdbedd47185e41ece37f72773744d;hp=7e2a0b389d7bbc1c778ae8625caa9de980d03c41;hpb=2a20131eaa6c963884881a48f8ec73df621b4d74;p=openldap

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 7e2a0b389d..b0cd52e28f 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -1,4 +1,9 @@
 /* entry.c - routines for dealing with entries */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -15,24 +20,33 @@ 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;
 	char		*value;
 	char		*next;
-	int		vlen, nvals, maxvals;
+	ber_len_t	vlen;
+	int		nvals, maxvals;
 	struct berval	bval;
 	struct berval	*vals[2];
 	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]*
@@ -47,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( *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,
@@ -69,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;
@@ -96,21 +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 );
+				    e->e_id, e->e_dn,
+					value != NULL ? value : NULL );
+				if( value != NULL ) free( 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 = dn_normalize_case( ch_strdup( value ) );
+			e->e_dn = value != NULL ? value : ch_strdup( "" );
 			continue;
 		}
 
@@ -121,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++;
 	}
 
@@ -134,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 );
@@ -152,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 ); \
@@ -164,9 +169,7 @@ str2entry( char	*s )
 char *
 entry2str(
     Entry	*e,
-    int		*len,
-    int		printid
-)
+    int		*len )
 {
 	Attribute	*a;
 	struct berval	*bv;
@@ -181,19 +184,12 @@ 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>" */
 		tmplen = strlen( e->e_dn );
 		MAKE_SPACE( LDIF_SIZE_NEEDED( 2, tmplen ));
-		ldif_put_type_and_value( (char **) &ecur, "dn", e->e_dn, tmplen );
+		ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, "dn", e->e_dn, tmplen );
 	}
 
 	/* put the attributes */
@@ -203,7 +199,7 @@ entry2str(
 			bv = a->a_vals[i];
 			tmplen = strlen( a->a_type );
 			MAKE_SPACE( LDIF_SIZE_NEEDED( tmplen, bv->bv_len ));
-			ldif_put_type_and_value( (char **) &ecur, a->a_type,
+			ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, a->a_type,
 			    bv->bv_val, bv->bv_len );
 		}
 	}
@@ -217,7 +213,6 @@ entry2str(
 void
 entry_free( Entry *e )
 {
-	int		i;
 	Attribute	*a, *next;
 
 	if ( e->e_dn != NULL ) {