exploit new frontend API 2 protocol error mapping

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 25430df987f7a5cfddeb8543b78715c97c65abf9..a62977520e03a89246f866eea6cf4f403cfe1248 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -169,7 +169,7 @@ meta_back_bind( Operation *op, SlapReply *rs )
                        rs->sr_err = LDAP_INVALID_CREDENTIALS;
                }
 
-               rs->sr_err = ldap_back_map_result( rs );
+               rs->sr_err = slap_map_api2result( rs );
                send_ldap_result( op, rs );
                return -1;
        }
@@ -214,7 +214,7 @@ meta_back_do_single_bind(
                rs->sr_err = ldap_set_option( lsc->ld, 
                                LDAP_OPT_SERVER_CONTROLS, op->o_ctrls );
                if ( rs->sr_err != LDAP_SUCCESS ) {
-                       rs->sr_err = ldap_back_map_result( rs );
+                       rs->sr_err = slap_map_api2result( rs );
                        goto return_results;
                }
        }
@@ -226,7 +226,7 @@ meta_back_do_single_bind(
                        LDAP_SASL_SIMPLE, &op->oq_bind.rb_cred,
                        op->o_ctrls, NULL, NULL);
        if ( rs->sr_err != LDAP_SUCCESS ) {
-               rs->sr_err = ldap_back_map_result( rs );
+               rs->sr_err = slap_map_api2result( rs );
                goto return_results;
        }
 
@@ -436,7 +436,7 @@ meta_back_op_result( struct metaconn *lc, Operation *op, SlapReply *rs )
                                        LDAP_OPT_ERROR_STRING, &msg );
                        ldap_get_option( lsc->ld,
                                        LDAP_OPT_MATCHED_DN, &match );
-                       rs->sr_err = ldap_back_map_result( rs );
+                       rs->sr_err = slap_map_api2result( rs );
 
 #ifdef NEW_LOGGING
                        LDAP_LOG( BACK_META, RESULTS,

diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index 30314eb9f672435ea5ae9adf69ae8f066def5ad5..da20763aab9879f1cf880fc0e1dd1ef0007ad74f 100644 (file)
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -194,7 +194,7 @@ meta_back_compare( Operation *op, SlapReply *rs )
                                        break;
 
                                default:
-                                       rres = ldap_back_map_result( rs );
+                                       rres = slap_map_api2result( rs );
 
                                        if ( err != NULL ) {
                                                free( err );

diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index 0d3a4839ea23f001c0cc6d2df4dfc4de8476e9f0..9b8ba83b95ba73eebab9692e31a9c176ecfd7d58 100644 (file)
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -207,7 +207,7 @@ init_one_conn(
         */
        rs->sr_err = ldap_initialize( &lsc->ld, lt->uri );
        if ( rs->sr_err != LDAP_SUCCESS ) {
-               return ldap_back_map_result( rs );
+               return slap_map_api2result( rs );
        }
 
        /*

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index c4e0a2513180410e836173e2aaab2419e50e33ca..ceea4402b43f7026a2b240a559a97d666ea5a98d 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -430,7 +430,7 @@ new_candidate:;
                                                res, 1 );
                                res = NULL;
 
-                               sres = ldap_back_map_result( rs );
+                               sres = slap_map_api2result( rs );
                                if ( err != NULL ) {
                                        free( err );
                                }