X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=dd9a95918eb4d7a7af4acf1ae2205c79e0f6309b;hb=a5ee438c9394a19a241716d3d922299c20b0365d;hp=fd6fd49a5f6647816cd23f7c55314850b03053a5;hpb=c51f35fe0f505c608a2ba2fdd4b65b9465014b3d;p=openldap

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index fd6fd49a5f..dd9a95918e 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -1,6 +1,7 @@
 /* entry.c - routines for dealing with entries */
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -21,26 +22,32 @@ static int		emaxsize;/* max size of ebuf	     		 */
 
 int entry_destroy(void)
 {
-	free( *ebuf );
+	free( ebuf );
 	ebuf = NULL;
 	ecur = NULL;
 	emaxsize = 0;
 	return 0;
 }
 
+
 Entry *
 str2entry( char *s )
 {
+	int rc;
 	Entry		*e;
-	Attribute	**a;
+	Attribute	**a = NULL;
 	char		*type;
-	char		*value;
-	char		*next;
-	ber_len_t	vlen;
-	int		nvals, maxvals;
-	struct berval	bval;
+	struct berval value;
 	struct berval	*vals[2];
-	char		ptype[64];
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+	AttributeDescription *ad;
+	const char *text;
+#else
+	int		nvals = 0;
+	int		maxvals = 0;
+	char	ptype[64];	/* fixed size buffer */
+#endif
+	char	*next;
 
 	/*
 	 * LDIF is used as the string format.
@@ -60,10 +67,8 @@ str2entry( char *s )
 	Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
 		s ? s : "NULL", 0, 0 );
 
-	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,25 +77,33 @@ 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[0] = &value;
 	vals[1] = NULL;
+#ifndef SLAPD_SCHEMA_NOT_COMPAT
 	ptype[0] = '\0';
+#endif
+
+	next = s;
 	while ( (s = ldif_getline( &next )) != NULL ) {
 		if ( *s == '\n' || *s == '\0' ) {
 			break;
 		}
 
-		if ( ldif_parse_line( s, &type, &value, &vlen ) != 0 ) {
+		if ( ldif_parse_line( s, &type, &value.bv_val, &value.bv_len ) != 0 ) {
 			Debug( LDAP_DEBUG_TRACE,
 			    "<= str2entry NULL (parse_line)\n", 0, 0, 0 );
 			continue;
 		}
 
+#ifndef SLAPD_SCHEMA_NOT_COMPAT
 		if ( strcasecmp( type, ptype ) != 0 ) {
 			strncpy( ptype, type, sizeof(ptype) - 1 );
 			nvals = 0;
@@ -98,38 +111,57 @@ str2entry( char *s )
 			a = NULL;
 		}
 
+#endif
 		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 );
+					value.bv_val != NULL ? value.bv_val : "" );
+				if( value.bv_val != NULL ) free( value.bv_val );
 				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.bv_val != NULL ? value.bv_val : ch_strdup( "" );
 			continue;
 		}
 
-		bval.bv_val = value;
-		bval.bv_len = vlen;
-		if ( attr_merge_fast( e, type, vals, nvals, 1, &maxvals, &a )
-		    != 0 ) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		ad = NULL;
+		rc = slap_str2ad( type, &ad, &text );
+
+		if( rc != LDAP_SUCCESS ) {
+			Debug( LDAP_DEBUG_TRACE,
+				"<= str2entry NULL (str2ad=%s)\n", text, 0, 0 );
+			entry_free( e );
+			free( value.bv_val );
+			free( type );
+			return( NULL );
+		}
+
+		rc = attr_merge( e, ad, vals );
+
+		ad_free( ad, 1 );
+#else
+		rc = attr_merge_fast( e, type, vals, nvals, 1, &maxvals, &a );
+#endif
+
+		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_TRACE,
 			    "<= str2entry NULL (attr_merge)\n", 0, 0, 0 );
 			entry_free( e );
+			free( value.bv_val );
+			free( type );
 			return( NULL );
 		}
+
+		free( type );
+		free( value.bv_val );
+#ifndef SLAPD_SCHEMA_NOT_COMPAT
 		nvals++;
+#endif
 	}
 
 	/* check to make sure there was a dn: line */
@@ -140,13 +172,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 );
@@ -154,18 +182,19 @@ str2entry( char *s )
 	return( e );
 }
 
+
 #define GRABSIZE	BUFSIZ
 
 #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 ); \
 			emaxsize += GRABSIZE; \
 			ecur = ebuf + offset; \
 		} \
-}
+	}
 
 char *
 entry2str(
@@ -178,7 +207,6 @@ entry2str(
 
 	/*
 	 * In string format, an entry looks like this:
-	 *	<id>\n
 	 *	dn: <dn>\n
 	 *	[<attr>: <value>\n]*
 	 */
@@ -198,9 +226,18 @@ entry2str(
 		/* put "<type>:[:] <value>" line for each value */
 		for ( i = 0; a->a_vals[i] != NULL; i++ ) {
 			bv = a->a_vals[i];
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+			tmplen = a->a_desc->ad_cname->bv_len;
+#else
 			tmplen = strlen( a->a_type );
+#endif
 			MAKE_SPACE( LDIF_SIZE_NEEDED( tmplen, bv->bv_len ));
-			ldif_sput( (char **) &ecur, LDIF_PUT_VALUE, a->a_type,
+			ldif_sput( (char **) &ecur, LDIF_PUT_VALUE,
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+				a->a_desc->ad_cname->bv_val,
+#else
+				a->a_type,
+#endif
 			    bv->bv_val, bv->bv_len );
 		}
 	}