From: Luke Howard <lukeh@openldap.org>
Date: Sun, 23 May 2004 15:51:58 +0000 (+0000)
Subject: Fix breakage
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~335
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e932093f475bc8af7c803154e2e8f4a979ac6c6a;p=openldap

Fix breakage
---

diff --git a/servers/slapd/slapi/proto-slapi.h b/servers/slapd/slapi/proto-slapi.h
index 2710ece83c..9544e4acf9 100644
--- a/servers/slapd/slapi/proto-slapi.h
+++ b/servers/slapd/slapi/proto-slapi.h
@@ -303,7 +303,8 @@ extern Slapi_PBlock *slapi_modrdn_internal( char * olddn, char * newrdn,
 		int deloldrdn, LDAPControl **controls, int log_change);
 extern char **slapi_get_supported_extended_ops(void);
 extern struct berval *slapi_int_get_supported_extop( int );
-Connection *slapi_int_init_connection(char *DN, int OpType);
+extern Connection *slapi_int_init_connection(char *DN, int OpType);
+extern void slapi_int_connection_destroy( Connection **pConn );
 
 /*
  * Was: slapi_cl.h
diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 0640c72045..fff7d97067 100644
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -225,7 +225,7 @@ slapi_int_init_connection(
 	return pConn;
 }
 
-static void slapi_int_connection_destroy( Connection **pConn )
+void slapi_int_connection_destroy( Connection **pConn )
 {
 	Connection *conn = *pConn;
 	Operation *op;
diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index e0af81be67..9abff75201 100644
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -4112,7 +4112,7 @@ int slapi_entry_rdn_values_present( const Slapi_Entry *e )
 			LDAPAVA *ava = &rdn[0][i];
 			Slapi_Attr *a = NULL;
 
-			if ( slapi_attr_entry_attr_find( e, ava->la_attr.bv_val, &a ) == 0 &&
+			if ( slapi_entry_attr_find( (Slapi_Entry *)e, ava->la_attr.bv_val, &a ) == 0 &&
 			     slapi_attr_value_find( a, &ava->la_value ) == 0 )
 				match++;
 		}
@@ -4147,7 +4147,7 @@ int slapi_entry_add_rdn_values( Slapi_Entry *e )
 			LDAPAVA *ava = &rdn[0][i];
 			Slapi_Attr *a = NULL;
 
-			if ( slapi_attr_entry_attr_find( e, ava->la_attr.bv_val, &a ) == 0 &&
+			if ( slapi_entry_attr_find( e, ava->la_attr.bv_val, &a ) == 0 &&
 			     slapi_attr_value_find( a, &ava->la_value ) == 0 )
 				continue;