Fix breakage

diff --git a/servers/slapd/slapi/proto-slapi.h b/servers/slapd/slapi/proto-slapi.h
index 2710ece83c34dee40bc5db42e715cc14b7f4fcc6..9544e4acf93debf8f1f80d679889ae2c761bf260 100644 (file)
--- 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 0640c72045c0b8b4ec100b801a90803dbf7bdd4e..fff7d970675b2afcdf3b8111c4731993f5951ff6 100644 (file)
--- 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 e0af81be67af3a8b18e0258da1c4e859a3e0d26c..9abff7520107a036a041b61dd7434bdc1b398497 100644 (file)
--- 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;