/* repl.c - log modifications for replication purposes */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
void *change
)
{
- LDAPModList *ml;
+ Modifications *ml;
Entry *e;
struct replog_moddn *moddn;
char *tmp;
case LDAP_REQ_MODIFY:
fprintf( fp, "changetype: modify\n" );
ml = change;
- for ( ; ml != NULL; ml = ml->ml_next ) {
- switch ( ml->ml_op & ~LDAP_MOD_BVALUES ) {
+ for ( ; ml != NULL; ml = ml->sml_next ) {
+ char *type;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ type = ml->sml_desc->ad_cname->bv_val;
+#else
+ type = ml->sml_type;
+#endif
+ switch ( ml->sml_op ) {
case LDAP_MOD_ADD:
- fprintf( fp, "add: %s\n", ml->ml_type );
+ fprintf( fp, "add: %s\n", type );
break;
case LDAP_MOD_DELETE:
- fprintf( fp, "delete: %s\n", ml->ml_type );
+ fprintf( fp, "delete: %s\n", type );
break;
case LDAP_MOD_REPLACE:
- fprintf( fp, "replace: %s\n", ml->ml_type );
+ fprintf( fp, "replace: %s\n", type );
break;
}
- for ( i = 0; ml->ml_bvalues != NULL &&
- ml->ml_bvalues[i] != NULL; i++ ) {
+ for ( i = 0; ml->sml_bvalues != NULL &&
+ ml->sml_bvalues[i] != NULL; i++ ) {
char *buf, *bufp;
- len = strlen( ml->ml_type );
+ len = strlen( type );
len = LDIF_SIZE_NEEDED( len,
- ml->ml_bvalues[i]->bv_len ) + 1;
+ ml->sml_bvalues[i]->bv_len ) + 1;
buf = (char *) ch_malloc( len );
bufp = buf;
- ldif_put_type_and_value( &bufp, ml->ml_type,
- ml->ml_bvalues[i]->bv_val,
- ml->ml_bvalues[i]->bv_len );
+ ldif_sput( &bufp, LDIF_PUT_VALUE,
+ type,
+ ml->sml_bvalues[i]->bv_val,
+ ml->sml_bvalues[i]->bv_len );
*bufp = '\0';
fputs( buf, fp );
e = change;
fprintf( fp, "changetype: add\n" );
ldap_pvt_thread_mutex_lock( &entry2str_mutex );
- tmp = entry2str( e, &len, 0 );
+ tmp = entry2str( e, &len );
while ( (tmp = strchr( tmp, '\n' )) != NULL ) {
tmp++;
if ( ! isspace( (unsigned char) *tmp ) )