Add entry_dup(); make slapi_entry_dup() use it

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 289251c9e787cc229b7654562a8934434cea621c..b907cd0acd596529f3f969500062c51ef82116b7 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -745,3 +745,19 @@ 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;
+       ber_dupbv( &ret->e_bv, &e->e_bv );
+       ret->e_private = NULL;
+}
+

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 42494eba505af439d81648ee837a26cbba57e340..9664030f911420d509793db7beed4242c69024da 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -465,6 +465,7 @@ LDAP_SLAPD_F (void) entry_free LDAP_P(( Entry *e ));
 LDAP_SLAPD_F (int) entry_cmp LDAP_P(( Entry *a, Entry *b ));
 LDAP_SLAPD_F (int) entry_dn_cmp LDAP_P(( const void *v_a, const void *v_b ));
 LDAP_SLAPD_F (int) entry_id_cmp LDAP_P(( const void *v_a, const void *v_b ));
+LDAP_SLAPD_F (Entry *) entry_dup LDAP_P(( Entry *e ));
 
 /*
  * extended.c

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 4ed0816fd42af8c09fc1d5a4a94356e176296a54..dfb6ef34735d68c0ed3beb64b4c238e67c5ae07d 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -166,17 +166,7 @@ Slapi_Entry *
 slapi_entry_dup( Slapi_Entry *e ) 
 {
 #ifdef LDAP_SLAPI
-       Slapi_Entry *ret;
-
-       ret = (Slapi_Entry *)slapi_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;
-       ber_dupbv( &ret->e_bv, &e->e_bv );
-       ret->e_private = NULL;
+       return entry_dup( e );
 #else /* LDAP_SLAPI */
        return NULL;
 #endif /* LDAP_SLAPI */