From 4e71b85481284ca0480eaea74be6f50faee97a27 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Mon, 5 Apr 2004 17:32:59 +0000 Subject: [PATCH] exploit new frontend API 2 protocol error mapping --- servers/slapd/back-meta/bind.c | 8 ++++---- servers/slapd/back-meta/compare.c | 2 +- servers/slapd/back-meta/conn.c | 2 +- servers/slapd/back-meta/search.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c index 25430df987..a62977520e 100644 --- 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 30314eb9f6..da20763aab 100644 --- 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 0d3a4839ea..9b8ba83b95 100644 --- 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 c4e0a25131..ceea4402b4 100644 --- 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 ); } -- 2.39.5