repl_user multimaster fix from ando (already in HEAD)

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 5160d6cfd001d82ff8918707f3a9d8f4fd93bdb8..d5aed5ad8eac23bf78e3970a204bc26df02b666d 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -125,8 +125,8 @@ do_delete(
         */
        if ( be->be_delete ) {
                /* do the update here */
-#ifndef SLAPD_MULTIMASTER
                int repl_user = be_isupdate( be, op->o_ndn );
+#ifndef SLAPD_MULTIMASTER
                if ( be->be_update_ndn == NULL || repl_user )
 #endif
                {

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 527b0afefa3840acf1f9214a7d67920e00f55dd5..e1d1fa02caf08aa9875bd9948748c1c57d7d6802 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -228,8 +228,8 @@ do_modrdn(
         */
        if ( be->be_modrdn ) {
                /* do the update here */
-#ifndef SLAPD_MULTIMASTER
                int repl_user = be_isupdate( be, op->o_ndn );
+#ifndef SLAPD_MULTIMASTER
                if ( be->be_update_ndn == NULL || repl_user )
 #endif
                {