ITS#6255

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 289a0f4d09555597a3fb701f8745d6385dad9469..fcf6cb02a42234cf809aeddf4b7367ad4d7cb99c 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -732,6 +732,7 @@ int entry_encode(Entry *e, struct berval *bv)
 
        Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n",
                (long) e->e_id, e->e_dn, 0 );
+
        dnlen = e->e_name.bv_len;
        ndnlen = e->e_nname.bv_len;
 
@@ -782,6 +783,10 @@ int entry_encode(Entry *e, struct berval *bv)
                        }
                }
        }
+
+       Debug( LDAP_DEBUG_TRACE, "<= entry_encode(0x%08lx): %s\n",
+               (long) e->e_id, e->e_dn, 0 );
+
        return 0;
 }
 
@@ -931,17 +936,22 @@ int entry_decode(EntryHeader *eh, Entry **e)
        return 0;
 }
 
+int entry_dup_to( Entry *source, Entry *dest )
+{
+       dest->e_id = source->e_id;
+       ber_dupbv( &dest->e_name, &source->e_name );
+       ber_dupbv( &dest->e_nname, &source->e_nname );
+       dest->e_attrs = attrs_dup( source->e_attrs );
+       dest->e_ocflags = source->e_ocflags;
+       return LDAP_SUCCESS;
+}
+
 Entry *entry_dup( Entry *e )
 {
        Entry *ret;
 
        ret = entry_alloc();
-
-       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;
+       entry_dup_to(e, ret);
 
        return ret;
 }