rework op/rs structures to deal with opeartional attributes

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 6c133312c6984b40aed7cc235342eadf4fea0605..84f08f464af43ff48c55013c42faae311fc0d2af 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -50,24 +50,24 @@ do_modrdn(
     SlapReply  *rs
 )
 {
-       struct berval dn = { 0, NULL };
-       struct berval newrdn = { 0, NULL };
-       struct berval newSuperior = { 0, NULL };
+       struct berval dn = BER_BVNULL;
+       struct berval newrdn = BER_BVNULL;
+       struct berval newSuperior = BER_BVNULL;
        ber_int_t       deloldrdn;
 
-       struct berval pnewSuperior = { 0, NULL };
+       struct berval pnewSuperior = BER_BVNULL;
 
-       struct berval nnewSuperior = { 0, NULL };
+       struct berval nnewSuperior = BER_BVNULL;
 
        Backend *newSuperior_be = NULL;
        ber_len_t       length;
        int manageDSAit;
 
-       struct berval pdn = { 0, NULL };
-       struct berval org_req_dn = { 0, NULL };
-       struct berval org_req_ndn = { 0, NULL };
-       struct berval org_dn = { 0, NULL };
-       struct berval org_ndn = { 0, NULL };
+       struct berval pdn = BER_BVNULL;
+       struct berval org_req_dn = BER_BVNULL;
+       struct berval org_req_ndn = BER_BVNULL;
+       struct berval org_dn = BER_BVNULL;
+       struct berval org_ndn = BER_BVNULL;
        int     org_managedsait;
 
 #ifdef NEW_LOGGING
@@ -236,7 +236,7 @@ do_modrdn(
                goto cleanup;
        }
 
-       if( rdnValidate( &op->orr_newrdn ) != LDAP_SUCCESS ) {
+       if( rdn_validate( &op->orr_newrdn ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR, 
                        "do_modrdn: invalid rdn (%s).\n", op->orr_newrdn.bv_val, 0, 0 );
@@ -362,11 +362,9 @@ do_modrdn(
         */
        if ( op->o_bd->be_modrdn ) {
                /* do the update here */
-               int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
+               int repl_user = be_isupdate( op );
 #ifndef SLAPD_MULTIMASTER
                if ( !SLAP_SHADOW(op->o_bd) || repl_user )
-#else
-               if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo ))
 #endif
                {
                        slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
@@ -483,7 +481,7 @@ slap_modrdn2mods(
        assert( new_rdn != NULL );
        assert( !op->orr_deleteoldrdn || old_rdn != NULL );
 
-       repl_user = be_isupdate( op->o_bd, &op->o_ndn );
+       repl_user = be_isupdate( op );
 
        /* Add new attribute values to the entry */
        for ( a_cnt = 0; new_rdn[a_cnt]; a_cnt++ ) {