From c332df50ded20d17f72d0e6cebf75de20ea4caf2 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 16 Jun 2000 04:07:57 +0000 Subject: [PATCH] Remove unnecessary arg from front end backend_check_referrals call --- servers/slapd/add.c | 5 +---- servers/slapd/backend.c | 8 ++++---- servers/slapd/compare.c | 5 +---- servers/slapd/delete.c | 5 +---- servers/slapd/modify.c | 5 +---- servers/slapd/modrdn.c | 5 +---- servers/slapd/proto-slap.h | 3 +-- servers/slapd/search.c | 4 +--- 8 files changed, 11 insertions(+), 29 deletions(-) diff --git a/servers/slapd/add.c b/servers/slapd/add.c index c0b93363ce..347496d1b1 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -156,7 +156,6 @@ do_add( Connection *conn, Operation *op ) /* make sure this backend recongizes critical controls */ rc = backend_check_controls( be, conn, op, &text ) ; - if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); @@ -164,9 +163,7 @@ do_add( Connection *conn, Operation *op ) } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, - e->e_dn, e->e_ndn, &text ); - + rc = backend_check_referrals( be, conn, op, e->e_dn, e->e_ndn ); if ( rc != LDAP_SUCCESS ) { goto done; } diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index d1c0adaab9..e6f5f7606f 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -620,15 +620,15 @@ int backend_check_referrals( Connection *conn, Operation *op, const char *dn, - const char *ndn, - const char **text ) + const char *ndn ) { int rc = LDAP_SUCCESS; - *bv = NULL; if( be->be_chk_referrals ) { + const char *text; + rc = be->be_chk_referrals( be, - conn, op, dn, ndn, text ); + conn, op, dn, ndn, &text ); if( rc != LDAP_SUCCESS && rc != LDAP_REFERRAL ) { send_ldap_result( conn, op, rc, diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c index 6c1f8a6ed3..b8c93fc132 100644 --- a/servers/slapd/compare.c +++ b/servers/slapd/compare.c @@ -107,7 +107,6 @@ do_compare( /* make sure this backend recongizes critical controls */ rc = backend_check_controls( be, conn, op, &text ) ; - if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); @@ -115,9 +114,7 @@ do_compare( } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, - dn, ndn, &text ); - + rc = backend_check_referrals( be, conn, op, dn, ndn ); if ( rc != LDAP_SUCCESS ) { goto cleanup; } diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index 324b3524c1..d086e1fde1 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -81,7 +81,6 @@ do_delete( /* make sure this backend recongizes critical controls */ rc = backend_check_controls( be, conn, op, &text ) ; - if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); @@ -89,9 +88,7 @@ do_delete( } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, - dn, ndn, &text ); - + rc = backend_check_referrals( be, conn, op, dn, ndn ); if ( rc != LDAP_SUCCESS ) { goto cleanup; } diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index d0427f7e7b..96f60159fb 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -171,7 +171,6 @@ do_modify( /* make sure this backend recongizes critical controls */ rc = backend_check_controls( be, conn, op, &text ) ; - if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); @@ -179,9 +178,7 @@ do_modify( } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, - dn, ndn, &text ); - + rc = backend_check_referrals( be, conn, op, dn, ndn ); if ( rc != LDAP_SUCCESS ) { goto cleanup; } diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c index 0ac91bdff4..b77e7d8f23 100644 --- a/servers/slapd/modrdn.c +++ b/servers/slapd/modrdn.c @@ -167,7 +167,6 @@ do_modrdn( /* make sure this backend recongizes critical controls */ rc = backend_check_controls( be, conn, op, &text ) ; - if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); @@ -175,9 +174,7 @@ do_modrdn( } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, - dn, ndn, &text ); - + rc = backend_check_referrals( be, conn, op, dn, ndn ); if ( rc != LDAP_SUCCESS ) { goto cleanup; } diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 9b6418045b..826c6e9cbb 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -160,8 +160,7 @@ LIBSLAPD_F( int ) backend_check_referrals LDAP_P(( Connection *conn, Operation *op, const char *dn, - const char *ndn, - const char **text )); + const char *ndn )); LIBSLAPD_F (int) backend_connection_init LDAP_P((Connection *conn)); LIBSLAPD_F (int) backend_connection_destroy LDAP_P((Connection *conn)); diff --git a/servers/slapd/search.c b/servers/slapd/search.c index 73db58b2e6..3959645337 100644 --- a/servers/slapd/search.c +++ b/servers/slapd/search.c @@ -223,9 +223,7 @@ do_search( } /* check for referrals */ - rc = backend_check_referrals( be, conn, op, - base, nbase, &text ); - + rc = backend_check_referrals( be, conn, op, base, nbase ); if ( rc != LDAP_SUCCESS ) { goto return_results; } -- 2.39.5