ITS#2846 - make veryclean

[openldap] / servers / slapd / repl.c

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 9df3b68795a04383ff5dca3b764ef6b9597fd35a..0e5f69e3f7cd4ba27537a8c88111958aaef59038 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -1,8 +1,27 @@
 /* repl.c - log modifications for replication purposes */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -61,7 +80,7 @@ add_replica_suffix(
        dn.bv_val = (char *) suffix;
        dn.bv_len = strlen( dn.bv_val );
 
-       rc = dnNormalize2( NULL, &dn, &ndn );
+       rc = dnNormalize( 0, NULL, NULL, &dn, &ndn, NULL );
        if( rc != LDAP_SUCCESS ) {
                return 2;
        }
@@ -207,7 +226,7 @@ replog( Operation *op )
                                /* assume change parameter is a Modfications* */
                                /* fall thru */
                        case LDAP_REQ_MODIFY:
-                               for ( ml = op->oq_modify.rs_modlist; ml != NULL; ml = ml->sml_next ) {
+                               for ( ml = op->orm_modlist; ml != NULL; ml = ml->sml_next ) {
                                        int is_in, exclude;
 
                                        is_in = ad_inlist( ml->sml_desc, op->o_bd->be_replica[i]->ri_attrs );
@@ -228,7 +247,7 @@ replog( Operation *op )
                                }
                                break;
                        case LDAP_REQ_ADD:
-                               for ( a = op->oq_add.rs_e->e_attrs; a != NULL; a = a->a_next ) {
+                               for ( a = op->ora_e->e_attrs; a != NULL; a = a->a_next ) {
                                        int is_in, exclude;
 
                                        is_in = ad_inlist( a->a_desc, op->o_bd->be_replica[i]->ri_attrs );
@@ -279,13 +298,15 @@ replog1(
 
        case LDAP_REQ_MODIFY:
                fprintf( fp, "changetype: modify\n" );
-               ml = first ? first : op->oq_modify.rs_modlist;
+               ml = first ? first : op->orm_modlist;
                for ( ; ml != NULL; ml = ml->sml_next ) {
                        char *type;
                        if ( ri && ri->ri_attrs ) {
                                int is_in = ad_inlist( ml->sml_desc, ri->ri_attrs );
 
-                               if ( ( !is_in && !ri->ri_exclude ) || ( is_in && ri->ri_exclude ) ) {
+                               if ( ( !is_in && !ri->ri_exclude )
+                                       || ( is_in && ri->ri_exclude ) )
+                               {
                                        continue;
                                }
                        }
@@ -302,16 +323,21 @@ replog1(
                        case LDAP_MOD_REPLACE:
                                fprintf( fp, "replace: %s\n", type );
                                break;
+
+                       case LDAP_MOD_INCREMENT:
+                               fprintf( fp, "increment: %s\n", type );
+                               break;
                        }
-                       if ( ml->sml_bvalues )
+                       if ( ml->sml_bvalues ) {
                                print_vals( fp, &ml->sml_desc->ad_cname, ml->sml_bvalues );
+                       }
                        fprintf( fp, "-\n" );
                }
                break;
 
        case LDAP_REQ_ADD:
                fprintf( fp, "changetype: add\n" );
-               a = first ? first : op->oq_add.rs_e->e_attrs;
+               a = first ? first : op->ora_e->e_attrs;
                for ( ; a != NULL; a=a->a_next ) {
                        if ( ri && ri->ri_attrs ) {
                                int is_in = ad_inlist( a->a_desc, ri->ri_attrs );
@@ -356,10 +382,10 @@ replog1(
 
        case LDAP_REQ_MODRDN:
                fprintf( fp, "changetype: modrdn\n" );
-               fprintf( fp, "newrdn: %s\n", op->oq_modrdn.rs_newrdn.bv_val );
-               fprintf( fp, "deleteoldrdn: %d\n", op->oq_modrdn.rs_deleteoldrdn ? 1 : 0 );
-               if( op->oq_modrdn.rs_newSup != NULL ) {
-                       fprintf( fp, "newsuperior: %s\n", op->oq_modrdn.rs_newSup->bv_val );
+               fprintf( fp, "newrdn: %s\n", op->orr_newrdn.bv_val );
+               fprintf( fp, "deleteoldrdn: %d\n", op->orr_deleteoldrdn ? 1 : 0 );
+               if( op->orr_newSup != NULL ) {
+                       fprintf( fp, "newsuperior: %s\n", op->orr_newSup->bv_val );
                }
        }
        fprintf( fp, "\n" );