X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=37c72c3cb2c9d05f162135228e9097ca6eec1109;hb=329bd66d6ab650e052929af9ccc35bb7416bd87d;hp=7f28205e3dcbb5ef68408bcf8f765e48d6516114;hpb=629885a269e086b0685aaec4ae12a71356f4a455;p=openldap

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 7f28205e3d..37c72c3cb2 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
 
@@ -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 );
@@ -639,13 +659,23 @@ int entry_decode(struct berval *bv, Entry **e)
 	BerVarray bptr;
 
 	i = entry_getlen(&ptr);
+	if (!i) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, INFO, 
+			"entry_decode: entry length was zero\n", 0, 0, 0);
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"entry_decode: entry length was zero\n", 0, 0, 0);
+#endif
+		return LDAP_OTHER;
+	}
 	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
@@ -667,7 +697,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;
 		}
@@ -745,3 +775,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;
+}
+