ITS#2864 don't use sl_mark/release.

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index b907cd0acd596529f3f969500062c51ef82116b7..605247489c3e2f85561b1ee7365a92a4d01b78aa 100644 (file)
--- 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
 
@@ -757,7 +777,10 @@ Entry *entry_dup( Entry *e )
        ber_dupbv( &ret->e_nname, &e->e_nname );
        ret->e_attrs = attrs_dup( e->e_attrs );
        ret->e_ocflags = e->e_ocflags;
-       ber_dupbv( &ret->e_bv, &e->e_bv );
+       ret->e_bv.bv_val = NULL;
+       ret->e_bv.bv_len = 0;
        ret->e_private = NULL;
+
+       return ret;
 }