Remove unnecessary arg from front end backend_check_referrals call

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index c0b93363ceb242fb7f03b5660d798174969e0938..347496d1b1c0d8626ec3b604137d25b054bacde0 100644 (file)
--- 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 d1c0adaab9586ce1b2774793446ea9caf8a093d1..e6f5f7606fe7a7057e62c2a0f4ab65037058c363 100644 (file)
--- 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 6c1f8a6ed311c5366739243e63b21e34a9857a19..b8c93fc132ebc05a13eff6ced07f86349cb7fbb3 100644 (file)
--- 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 324b3524c17bbc24b2879c55ff9a5ec3a6c85f9e..d086e1fde1c6ed943e693cafdfab458e35adeadb 100644 (file)
--- 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 d0427f7e7b02fb720c35e078b97a0b1eb5c2305b..96f60159fb025ad9ba963f9bf359275cb838d007 100644 (file)
--- 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 0ac91bdff44a5486e77a4326786420132fe63f28..b77e7d8f2357378d7936879f9e818a8af00b8f6a 100644 (file)
--- 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 9b6418045b9bf34c4a346259818719ffe9173a10..826c6e9cbb150800674f2ac65910c6d0d2a1847e 100644 (file)
--- 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 73db58b2e6f5f4940fc8ed8e088f329179d6ebf4..3959645337627db74e5e443b1d6bf212e6379bbc 100644 (file)
--- 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;
        }