X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=605247489c3e2f85561b1ee7365a92a4d01b78aa;hb=b0b3eff457f0e431c4fd094d3d9cfeb6383df91d;hp=d01e5259280640c97d63b5634203fab0af9f22be;hpb=374d919fc04f5948df38f5f7095b9576c1839406;p=openldap

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index d01e525928..605247489c 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -1,8 +1,27 @@
 /* entry.c - routines for dealing with entries */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -66,9 +85,10 @@ str2entry( char *s )
 	 */
 
 #ifdef NEW_LOGGING
-	LDAP_LOG( OPERATION, DETAIL1, "str2entry: \"%s\"\n", s ? s : "NULL", 0, 0 );
+	LDAP_LOG( OPERATION, DETAIL1, "str2entry: \"%s\"\n",
+		s ? s : "NULL", 0, 0 );
 #else
-	Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
+	Debug( LDAP_DEBUG_TRACE, "=> str2entry: \"%s\"\n",
 		s ? s : "NULL", 0, 0 );
 #endif
 
@@ -127,7 +147,7 @@ str2entry( char *s )
 				return NULL;
 			}
 
-			rc = dnPrettyNormal( NULL, &vals[0], &e->e_name, &e->e_nname );
+			rc = dnPrettyNormal( NULL, &vals[0], &e->e_name, &e->e_nname, NULL );
 			if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 				LDAP_LOG( OPERATION, DETAIL1, 
@@ -191,7 +211,7 @@ str2entry( char *s )
 
 			if( pretty ) {
 				rc = pretty( ad->ad_type->sat_syntax,
-					&vals[0], &pval );
+					&vals[0], &pval, NULL );
 
 			} else if( validate ) {
 				/*
@@ -218,12 +238,12 @@ str2entry( char *s )
 			if( rc != 0 ) {
 #ifdef NEW_LOGGING
 				LDAP_LOG( OPERATION, ERR, 
-					"str2entry:  invalid value for syntax %s\n",
-					ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
+					"str2entry:  invalid value for attribute %s (syntax %s)\n",
+					ad->ad_cname.bv_val, ad->ad_type->sat_syntax->ssyn_oid, 0 );
 #else
 				Debug( LDAP_DEBUG_ANY,
-					"str2entry: invalid value for syntax %s\n",
-					ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
+					"str2entry: invalid value for attribute %s (syntax %s)\n",
+					ad->ad_cname.bv_val, ad->ad_type->sat_syntax->ssyn_oid, 0 );
 #endif
 				entry_free( e );
 				free( vals[0].bv_val );
@@ -247,7 +267,7 @@ str2entry( char *s )
 				SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
 				ad->ad_type->sat_syntax,
 				ad->ad_type->sat_equality,
-				&vals[0], &nvals[0] );
+				&vals[0], &nvals[0], NULL );
 
 			if( rc ) {
 #ifdef NEW_LOGGING
@@ -422,7 +442,7 @@ entry_free( Entry *e )
 int
 entry_cmp( Entry *e1, Entry *e2 )
 {
-	return( e1 < e2 ? -1 : (e1 > e2 ? 1 : 0) );
+	return SLAP_PTRCMP( e1, e2 );
 }
 
 int
@@ -430,9 +450,8 @@ entry_dn_cmp( const void *v_e1, const void *v_e2 )
 {
 	/* compare their normalized UPPERCASED dn's */
 	const Entry *e1 = v_e1, *e2 = v_e2;
-	int rc = e1->e_nname.bv_len - e2->e_nname.bv_len;
-	if (rc) return rc;
-	return( strcmp( e1->e_ndn, e2->e_ndn ) );
+
+	return ber_bvcmp( &e1->e_nname, &e2->e_nname );
 }
 
 int
@@ -442,6 +461,9 @@ entry_id_cmp( const void *v_e1, const void *v_e2 )
 	return( e1->e_id < e2->e_id ? -1 : (e1->e_id > e2->e_id ? 1 : 0) );
 }
 
+#define entry_lenlen(l)	((l) < 0x80) ? 1 : ((l) < 0x100) ? 2 : \
+	((l) < 0x10000) ? 3 : ((l) < 0x1000000) ? 4 : 5
+#if 0
 /* This is like a ber_len */
 static ber_len_t
 entry_lenlen(ber_len_t len)
@@ -456,6 +478,7 @@ entry_lenlen(ber_len_t len)
 		return 4;
 	return 5;
 }
+#endif
 
 static void
 entry_putlen(unsigned char **buf, ber_len_t len)
@@ -638,11 +661,11 @@ int entry_decode(struct berval *bv, Entry **e)
 	i = entry_getlen(&ptr);
 	x = ch_calloc(1, i);
 	i = entry_getlen(&ptr);
-	x->e_name.bv_val = ptr;
+	x->e_name.bv_val = (char *) ptr;
 	x->e_name.bv_len = i;
 	ptr += i+1;
 	i = entry_getlen(&ptr);
-	x->e_nname.bv_val = ptr;
+	x->e_nname.bv_val = (char *) ptr;
 	x->e_nname.bv_len = i;
 	ptr += i+1;
 #ifdef NEW_LOGGING
@@ -664,7 +687,7 @@ int entry_decode(struct berval *bv, Entry **e)
 	while ((i = entry_getlen(&ptr))) {
 		struct berval bv;
 		bv.bv_len = i;
-		bv.bv_val = ptr;
+		bv.bv_val = (char *) ptr;
 		if (a) {
 			a->a_next = (Attribute *)bptr;
 		}
@@ -742,3 +765,22 @@ int entry_decode(struct berval *bv, Entry **e)
 	*e = x;
 	return 0;
 }
+
+Entry *entry_dup( Entry *e )
+{
+	Entry *ret;
+
+	ret = (Entry *)ch_calloc( 1, sizeof(*ret) );
+
+	ret->e_id = e->e_id;
+	ber_dupbv( &ret->e_name, &e->e_name );
+	ber_dupbv( &ret->e_nname, &e->e_nname );
+	ret->e_attrs = attrs_dup( e->e_attrs );
+	ret->e_ocflags = e->e_ocflags;
+	ret->e_bv.bv_val = NULL;
+	ret->e_bv.bv_len = 0;
+	ret->e_private = NULL;
+
+	return ret;
+}
+