Compile problem when SLAPD_MULTIMASTER defined (ITS#1503)

[llarquere@aacom.fr]

Full_Name: Laurent Larquère
Version: 2.0.18/2.0.19
OS: Solaris 
URL: ftp://ftp.openldap.org/incoming/
Submission from: (NULL) (80.13.88.60)


When SLAPD_MULTIMASTER defined
servers/slapd/delete.c and modrdn.c dont compile
due to inversion of two lines.
repl_user must be defined outside #ifndef SLAPD_MULTIMASTER
diff -c follow ;

*** delete.c    Thu Dec 20 21:20:37 2001
--- delete.c.orig       Fri Dec 21 09:47:35 2001
***************
*** 125,132 ****
         */
        if ( be->be_delete ) {
                /* do the update here */
-               int repl_user = be_isupdate( be, op->o_ndn );
  #ifndef SLAPD_MULTIMASTER
                if ( be->be_update_ndn == NULL || repl_user )
  #endif
                {
--- 125,132 ----
         */
        if ( be->be_delete ) {
                /* do the update here */
  #ifndef SLAPD_MULTIMASTER
+               int repl_user = be_isupdate( be, op->o_ndn );
                if ( be->be_update_ndn == NULL || repl_user )
  #endif
                {


*** modrdn.c    Thu Dec 20 21:25:32 2001
--- modrdn.c.orig       Fri Dec 21 09:50:16 2001
***************
*** 228,235 ****
         */
        if ( be->be_modrdn ) {
                /* do the update here */
-               int repl_user = be_isupdate( be, op->o_ndn );
  #ifndef SLAPD_MULTIMASTER
                if ( be->be_update_ndn == NULL || repl_user )
  #endif
                {
--- 228,235 ----
         */
        if ( be->be_modrdn ) {
                /* do the update here */
  #ifndef SLAPD_MULTIMASTER
+               int repl_user = be_isupdate( be, op->o_ndn );
                if ( be->be_update_ndn == NULL || repl_user )
  #endif
                {