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

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index fd6fd49a5f..36baff5276 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,26 @@ 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];
+	AttributeDescription *ad;
+	const char *text;
+	char	*next;
 
 	/*
 	 * LDIF is used as the string format.
@@ -60,10 +61,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,64 +71,117 @@ 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;
-	ptype[0] = '\0';
+
+	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;
 		}
 
-		if ( strcasecmp( type, ptype ) != 0 ) {
-			strncpy( ptype, type, sizeof(ptype) - 1 );
-			nvals = 0;
-			maxvals = 0;
-			a = NULL;
-		}
-
 		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 ) {
+			e->e_dn = value.bv_val != NULL ? value.bv_val : ch_strdup( "" );
+			continue;
+		}
+
+		ad = NULL;
+		rc = slap_str2ad( type, &ad, &text );
+
+		if( rc != LDAP_SUCCESS ) {
+			Debug( LDAP_DEBUG_TRACE,
+				"<= str2entry: str2ad(%s): %s\n", type, text, 0 );
+
+			if( slapMode & SLAP_TOOL_MODE ) {
+				entry_free( e );
+				free( value.bv_val );
+				free( type );
+				return NULL;
+			}
+
+			rc = slap_str2undef_ad( type, &ad, &text );
+
+			if( rc != LDAP_SUCCESS ) {
+				Debug( LDAP_DEBUG_TRACE,
+					"<= str2entry: str2undef_ad(%s): %s\n",
+						type, text, 0 );
+				entry_free( e );
+				free( value.bv_val );
+				free( type );
+				return NULL;
+			}
+		}
+
+		if( slapMode & SLAP_TOOL_MODE ) {
+			slap_syntax_validate_func *validate =
+				ad->ad_type->sat_syntax->ssyn_validate;
+
+			if( !validate ) {
 				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 );
+					"str2entry: no validator for syntax %s\n",
+					ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
+				entry_free( e );
+				free( value.bv_val );
+				free( type );
+				return NULL;
+			}
+
+			/*
+			 * validate value per syntax
+			 */
+			rc = validate( ad->ad_type->sat_syntax, &value );
+
+			if( rc != 0 ) {
+				Debug( LDAP_DEBUG_TRACE,
+					"str2entry: invalid value for syntax %s\n",
+					ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
+				entry_free( e );
+				free( value.bv_val );
+				free( type );
+				return NULL;
 			}
-			e->e_ndn = ch_strdup( e->e_dn );
-			(void) dn_normalize_case( e->e_ndn );
-			continue;
 		}
 
-		bval.bv_val = value;
-		bval.bv_len = vlen;
-		if ( attr_merge_fast( e, type, vals, nvals, 1, &maxvals, &a )
-		    != 0 ) {
+		rc = attr_merge( e, ad, vals );
+
+		ad_free( ad, 1 );
+
+		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 );
 		}
-		nvals++;
+
+		free( type );
+		free( value.bv_val );
 	}
 
 	/* check to make sure there was a dn: line */
@@ -140,32 +192,29 @@ 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 );
+	Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> 0x%lx\n",
+		e->e_dn, (unsigned long) e, 0 );
 
 	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 +227,6 @@ entry2str(
 
 	/*
 	 * In string format, an entry looks like this:
-	 *	<id>\n
 	 *	dn: <dn>\n
 	 *	[<attr>: <value>\n]*
 	 */
@@ -198,9 +246,10 @@ entry2str(
 		/* put "<type>:[:] <value>" line for each value */
 		for ( i = 0; a->a_vals[i] != NULL; i++ ) {
 			bv = a->a_vals[i];
-			tmplen = strlen( a->a_type );
+			tmplen = a->a_desc->ad_cname->bv_len;
 			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,
+				a->a_desc->ad_cname->bv_val,
 			    bv->bv_val, bv->bv_len );
 		}
 	}
@@ -265,3 +314,185 @@ entry_id_cmp( Entry *e1, Entry *e2 )
 	return( e1->e_id < e2->e_id ? -1 : (e1->e_id > e2->e_id ? 1 : 0) );
 }
 
+#define SLAPD_SLEEPY 1
+#ifdef SLAPD_SLEEPY
+
+/* a DER encoded entry looks like:
+ *
+ * entry :== SEQUENCE {
+ *		dn		DistinguishedName,
+ *		ndn		NormalizedDistinguishedName,
+ *		attrs	SEQUENCE OF SEQUENCE {
+ *			type	AttributeType,
+ *			values	SET OF AttributeValue
+ *		}
+ * }
+ *
+ * Encoding/Decoding of DER should be much faster than LDIF
+ */
+
+int entry_decode( struct berval *bv, Entry **entry )
+{
+	int rc;
+	BerElement	*ber;
+	Entry		*e;
+	ber_tag_t	tag;
+	ber_len_t	len;
+	char *last;
+
+	ber = ber_init( bv );
+	if( ber == NULL ) {
+		Debug( LDAP_DEBUG_TRACE,
+		    "<= entry_decode: ber_init failed\n",
+		    0, 0, 0 );
+		return LDAP_LOCAL_ERROR;
+	}
+
+	/* initialize reader/writer lock */
+	e = (Entry *) ch_malloc( sizeof(Entry) );
+
+	if( e == NULL ) {
+		Debug( LDAP_DEBUG_ANY,
+		    "<= entry_decode: entry allocation failed\n",
+		    0, 0, 0 );
+		return LDAP_LOCAL_ERROR;
+	}
+
+	/* initialize entry */
+	e->e_id = NOID;
+	e->e_dn = NULL;
+	e->e_ndn = NULL;
+	e->e_attrs = NULL;
+	e->e_private = NULL;
+
+	tag = ber_scanf( ber, "{aa" /*"}"*/, &e->e_dn, &e->e_ndn );
+	if( tag == LBER_ERROR ) {
+		free( e );
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	Debug( LDAP_DEBUG_TRACE,
+	    "entry_decode: \"%s\"\n",
+	    e->e_dn, 0, 0 );
+
+	/* get the attrs */
+	for ( tag = ber_first_element( ber, &len, &last );
+		tag != LBER_DEFAULT;
+	    tag = ber_next_element( ber, &len, last ) )
+	{
+		struct berval *type;
+		struct berval **vals;
+		AttributeDescription *ad;
+		const char *text;
+
+		tag = ber_scanf( ber, "{O{V}}", &type, &vals );
+
+		if ( tag == LBER_ERROR ) {
+			Debug( LDAP_DEBUG_ANY, "entry_decode: decoding error\n", 0, 0, 0 );
+			entry_free( e );
+			return LDAP_PROTOCOL_ERROR;
+		}
+
+		if ( vals == NULL ) {
+			Debug( LDAP_DEBUG_ANY, "entry_decode: no values for type %s\n",
+				type, 0, 0 );
+			ber_bvfree( type );
+			entry_free( e );
+			return LDAP_PROTOCOL_ERROR;
+		}
+
+		ad = NULL;
+		rc = slap_bv2ad( type, &ad, &text );
+
+		if( rc != LDAP_SUCCESS ) {
+			Debug( LDAP_DEBUG_TRACE,
+				"<= entry_decode: str2ad(%s): %s\n", type, text, 0 );
+
+			rc = slap_bv2undef_ad( type, &ad, &text );
+
+			if( rc != LDAP_SUCCESS ) {
+				Debug( LDAP_DEBUG_TRACE,
+					"<= entry_decode: str2undef_ad(%s): %s\n",
+						type, text, 0 );
+				ber_bvfree( type );
+				ber_bvecfree( vals );
+				entry_free( e );
+				return rc;
+			}
+		}
+
+		rc = attr_merge( e, ad, vals );
+		ad_free( ad, 1 );
+
+		if( rc != 0 ) {
+			Debug( LDAP_DEBUG_TRACE,
+			    "<= entry_decode: attr_merge failed\n", 0, 0, 0 );
+			ber_bvfree( type );
+			ber_bvecfree( vals );
+			entry_free( e );
+			return LDAP_LOCAL_ERROR;
+		}
+
+		free( type );
+		ber_bvecfree( vals );
+	}
+
+	rc = ber_scanf( ber, /*"{"*/  "}" );
+	if( rc < 0 ) {
+		entry_free( e );
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	Debug(LDAP_DEBUG_TRACE, "<= entry_decode(%s)\n",
+		e->e_dn, 0, 0 );
+
+	*entry = e;
+	return LDAP_SUCCESS;
+}
+
+int entry_encode(
+	Entry *e,
+	struct berval **bv )
+{
+	int rc = -1;
+	Attribute *a;
+	BerElement *ber;
+	
+	Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n",
+		e->e_id, e->e_dn, 0 );
+
+	ber = ber_alloc_t( LBER_USE_DER );
+	if( ber == NULL ) {
+		goto done;
+	}
+
+	rc = ber_printf( ber, "{ss{" /*"}}"*/, e->e_dn, e->e_ndn );
+	if( rc < 0 ) {
+		goto done;
+	}
+
+	for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
+		rc = ber_printf( ber, "{O{V}}",
+			a->a_desc->ad_cname,
+			a->a_vals );
+		if( rc < 0 ) {
+			goto done;
+		}
+	}
+
+	rc = ber_printf( ber, /*"{{"*/ "}}" );
+	if( rc < 0 ) {
+		goto done;
+	}
+
+	rc = ber_flatten( ber, bv );
+
+done:
+	ber_free( ber, 1 );
+	if( rc ) {
+		Debug( LDAP_DEBUG_ANY, "=> entry_encode(0x%08lx): failed (%d)\n",
+			e->e_id, rc, 0 );
+	}
+	return rc;
+}
+#endif