Fix prev commit

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 0b33bd7f0836e77dfc3502129a4515f54c0d60d6..a0feb62b87ca022bcf19cde26920acc67d5c9e25 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -300,8 +300,7 @@ send_ldap_response(
        }
 
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &op->o_callback,
-                       *sc_next;
+               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
 
                rc = SLAP_CB_CONTINUE;
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
@@ -455,8 +454,7 @@ cleanup:;
 
 clean2:;
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &op->o_callback,
-                       *sc_next;
+               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
 
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
                        sc_next = op->o_callback->sc_next;
@@ -700,8 +698,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
        }
 
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &op->o_callback,
-                       *sc_next;
+               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
 
                rc = SLAP_CB_CONTINUE;
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next )
@@ -1147,8 +1144,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 
 error_return:;
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &op->o_callback,
-                       *sc_next;
+               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
 
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
                        sc_next = op->o_callback->sc_next;
@@ -1205,8 +1201,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
 
        rs->sr_type = REP_SEARCHREF;
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &op->o_callback,
-                       *sc_next;
+               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
 
                rc = SLAP_CB_CONTINUE;
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
@@ -1350,8 +1345,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
 
 rel:
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &op->o_callback,
-                       *sc_next;
+               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
 
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
                        sc_next = op->o_callback->sc_next;