(temporary?) fix to ITS#3434

diff --git a/servers/slapd/back-relay/config.c b/servers/slapd/back-relay/config.c
index a26918ae5c3865484ce23667c2c4b8f29fc11245..3c0c703ec714c0a105c29cbc7a4377573371a100 100644 (file)
--- a/servers/slapd/back-relay/config.c
+++ b/servers/slapd/back-relay/config.c
@@ -27,11 +27,11 @@
 
 int
 relay_back_db_config(
-    BackendDB  *be,
-    const char *fname,
-    int                lineno,
-    int                argc,
-    char       **argv
+       BackendDB       *be,
+       const char      *fname,
+       int             lineno,
+       int             argc,
+       char            **argv
 )
 {
        relay_back_info *ri = (struct relay_back_info *)be->be_private;
@@ -110,7 +110,7 @@ relay_back_db_config(
                                return 1;
                        }
 
-                       cargv[ 0 ] = "suffixmassage";
+                       cargv[ 0 ] = "rwm-suffixmassage";
                        cargv[ 1 ] = be->be_suffix[0].bv_val;
                        cargv[ 2 ] = pdn.bv_val;
                        cargv[ 3 ] = NULL;

diff --git a/servers/slapd/back-relay/init.c b/servers/slapd/back-relay/init.c
index b397a33d5d8289176fb60258ea30bf7866b04d25..85ab6e1da1f8a30d216b09edef24797cdad95ee1 100644 (file)
--- a/servers/slapd/back-relay/init.c
+++ b/servers/slapd/back-relay/init.c
@@ -48,7 +48,7 @@ relay_back_initialize( BackendInfo *bi )
        bi->bi_op_modrdn = relay_back_op_modrdn;
        bi->bi_op_add = relay_back_op_add;
        bi->bi_op_delete = relay_back_op_delete;
-       bi->bi_op_abandon = relay_back_op_abandon;
+       bi->bi_op_abandon = 0 /* relay_back_op_abandon */ ;
        bi->bi_op_cancel = relay_back_op_cancel;
        bi->bi_extended = relay_back_op_extended;
        bi->bi_entry_release_rw = relay_back_entry_release_rw;

diff --git a/servers/slapd/back-relay/op.c b/servers/slapd/back-relay/op.c
index 881e77a8301c0a394edfdf8eaee2c7387afc9f56..e80b591a1622364577501f92d0a912599c80a602 100644 (file)
--- a/servers/slapd/back-relay/op.c
+++ b/servers/slapd/back-relay/op.c
@@ -40,11 +40,11 @@ relay_back_swap_bd( struct slap_op *op, struct slap_rep *rs )
 static void
 relay_back_add_cb( slap_callback *cb, struct slap_op *op )
 {
-               cb->sc_next = op->o_callback;
-               cb->sc_response = relay_back_swap_bd;
-               cb->sc_cleanup = relay_back_swap_bd;
-               cb->sc_private = op->o_bd;
-               op->o_callback = cb;
+       cb->sc_next = op->o_callback;
+       cb->sc_response = relay_back_swap_bd;
+       cb->sc_cleanup = relay_back_swap_bd;
+       cb->sc_private = op->o_bd;
+       op->o_callback = cb;
 }
 
 static BackendDB *
@@ -83,7 +83,7 @@ relay_back_select_backend( struct slap_op *op, struct slap_rep *rs, int err )
                } else {
                        /* NOTE: err is LDAP_INVALID_CREDENTIALS for bind,
                         * LDAP_NO_SUCH_OBJECT for other operations.
-                        * noSuchObject is not allowed to be returned by bind */
+                        * noSuchObject cannot be returned by bind */
                        rs->sr_err = err;
                        send_ldap_result( op, rs );
                }