From 59f76d543c356248074b6863c93edc20461e4e99 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 20 Dec 2003 09:19:19 +0000 Subject: [PATCH] Clean up prev commit --- servers/slapd/repl.c | 238 ++++++++++++++++--------------------------- 1 file changed, 90 insertions(+), 148 deletions(-) diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c index 603634735d..c04a44247b 100644 --- a/servers/slapd/repl.c +++ b/servers/slapd/repl.c @@ -119,7 +119,7 @@ add_replica_attrs( static void print_vals( FILE *fp, struct berval *type, struct berval *bv ); static void -replog1( struct slap_replica_info *ri, Operation *op, FILE *fp, void *first); +replog1( struct slap_replica_info *ri, Operation *op, FILE *fp, long now); void replog( Operation *op ) @@ -189,14 +189,10 @@ replog( Operation *op ) } #endif - fprintf( fp, "time: %ld\n", now ); - fprintf( fp, "dn: %s\n", op->o_req_dn.bv_val ); - - replog1( NULL, op, fp, NULL ); + replog1( NULL, op, fp, now ); if ( subsets > 0 ) { - void *first; - for ( i = subsets - 1; op->o_bd->be_replica != NULL && op->o_bd->be_replica[i] != NULL; i++ ) { + for ( i = subsets - 1; op->o_bd->be_replica[i] != NULL; i++ ) { /* If no attrs, we already did this above */ if ( op->o_bd->be_replica[i]->ri_attrs == NULL ) { @@ -214,91 +210,23 @@ replog( Operation *op ) } if ( !op->o_bd->be_replica[i]->ri_nsuffix[j].bv_val ) { - /* do not add "replica:" line */ + /* no matching suffix found, skip it */ continue; } } - subsets = 0; - first = NULL; switch( op->o_tag ) { case LDAP_REQ_EXTENDED: /* quick hack for extended operations */ - /* assume change parameter is a Modfications* */ + /* assume change parameter is a Modifications* */ /* fall thru */ case LDAP_REQ_MODIFY: - for ( ml = op->orm_modlist; ml != NULL; ml = ml->sml_next ) { - int is_in, exclude, ocs = 0; - - exclude = op->o_bd->be_replica[i]->ri_exclude; - - if ( ml->sml_desc == slap_schema.si_ad_objectClass - && ml->sml_bvalues ) { - AttributeName *an; - for ( an = op->o_bd->be_replica[i]->ri_attrs; an->an_name.bv_val; an++ ) { - if ( an->an_oc ) { - int i, match = 0; - ocs = 1; - for ( i=0; ml->sml_bvalues[i].bv_val; i++ ) { - if ( ml->sml_bvalues[i].bv_len == an->an_name.bv_len - && !strcasecmp(ml->sml_bvalues[i].bv_val, - an->an_name.bv_val ) ) { - match = 1; - break; - } - } - match ^= exclude; - match ^= an->an_oc_exclude; - /* Found a match, stop looking */ - if ( match ) { - ocs = 2; - break; - } - } - } - if ( ocs == 1 ) continue; - } - - is_in = ad_inlist( ml->sml_desc, op->o_bd->be_replica[i]->ri_attrs ); - - /* - * there might be a more clever way to do this test, - * but this way, at least, is comprehensible :) - */ - if ( ( is_in && !exclude ) || ( !is_in && exclude ) ) { - subsets = 1; - first = ml; - break; - } - } - if ( !subsets ) { - continue; - } - break; case LDAP_REQ_ADD: - 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 ); - exclude = op->o_bd->be_replica[i]->ri_exclude; - - if ( ( is_in && !exclude ) || ( !is_in && exclude ) ) { - subsets = 1; - first = a; - break; - } - } - if ( !subsets ) { - continue; - } break; default: /* Other operations were logged in the first pass */ continue; } - fprintf( fp, "replica: %s\n", op->o_bd->be_replica[i]->ri_host ); - fprintf( fp, "time: %ld\n", now ); - fprintf( fp, "dn: %s\n", op->o_req_dn.bv_val ); - replog1( op->o_bd->be_replica[i], op, fp, first ); + replog1( op->o_bd->be_replica[i], op, fp, now ); } } @@ -306,31 +234,59 @@ replog( Operation *op ) ldap_pvt_thread_mutex_unlock( &replog_mutex ); } +static void +rephdr( + struct slap_replica_info *ri, + Operation *op, + FILE *fp, + long now +) +{ + if ( ri ) { + fprintf( fp, "replica: %s\n", ri->ri_host ); + } + fprintf( fp, "time: %ld\n", now ); + fprintf( fp, "dn: %s\n", op->o_req_dn.bv_val ); +} static void replog1( - struct slap_replica_info *ri, - Operation *op, - FILE *fp, - void *first + struct slap_replica_info *ri, + Operation *op, + FILE *fp, + long now ) { Modifications *ml; Attribute *a; AttributeName *an; - int domod = 1; + int dohdr = 1; + struct berval vals[2]; + vals[1].bv_val = NULL; + vals[1].bv_len = 0; switch ( op->o_tag ) { case LDAP_REQ_EXTENDED: /* quick hack for extended operations */ - /* assume change parameter is a Modfications* */ + /* assume change parameter is a Modifications* */ /* fall thru */ case LDAP_REQ_MODIFY: - ml = first ? first : op->orm_modlist; - for ( ; ml != NULL; ml = ml->sml_next ) { - char *type; - int ocs = 0; + for ( ml = op->orm_modlist; ml != NULL; ml = ml->sml_next ) { + char *did, *type = ml->sml_desc->ad_cname.bv_val; + switch ( ml->sml_op ) { + case LDAP_MOD_ADD: + did = "add"; break; + + case LDAP_MOD_DELETE: + did = "delete"; break; + + case LDAP_MOD_REPLACE: + did = "replace"; break; + + case LDAP_MOD_INCREMENT: + did = "increment"; break; + } if ( ri && ri->ri_attrs ) { int is_in = ad_inlist( ml->sml_desc, ri->ri_attrs ); @@ -344,76 +300,55 @@ replog1( */ if ( ml->sml_desc == slap_schema.si_ad_objectClass && ml->sml_bvalues ) { - for ( an = ri->ri_attrs; an->an_name.bv_val; an++ ) { - if ( an->an_oc ) { - int i, match = 0; - ocs = 1; - for ( i=0; ml->sml_bvalues[i].bv_val; i++ ) { + int i, ocs = 0, first = 1; + for ( i=0; ml->sml_bvalues[i].bv_val; i++ ) { + int match = 0; + for ( an = ri->ri_attrs; an->an_name.bv_val; an++ ) { + if ( an->an_oc ) { + ocs = 1; if ( ml->sml_bvalues[i].bv_len == an->an_name.bv_len && !strcasecmp(ml->sml_bvalues[i].bv_val, an->an_name.bv_val ) ) { - match = 1; + match = 1 ^ an->an_oc_exclude; break; } } + } + if ( ocs ) { match ^= ri->ri_exclude; - match ^= an->an_oc_exclude; - /* Found a match, stop looking */ + /* Found a match, log it */ if ( match ) { + if ( dohdr ) { + rephdr( ri, op, fp, now ); + fprintf( fp, "changetype: modify\n" ); + dohdr = 0; + } + if ( first ) { + fprintf( fp, "%s: %s\n", did, type ); + first = 0; + } + vals[0] = an->an_name; + print_vals( fp, &ml->sml_desc->ad_cname, vals ); ocs = 2; - break; } } } + /* Explicit objectclasses have been handled already */ + if ( ocs ) { + if ( ocs == 2 ) { + fprintf( fp, "-\n" ); + } + continue; + } } - /* Have explicit objectClasses, but none matched - forget it */ - if ( ocs == 1 ) continue; } - if ( domod ) { + if ( dohdr ) { + rephdr( ri, op, fp, now ); fprintf( fp, "changetype: modify\n" ); - domod = 0; - } - type = ml->sml_desc->ad_cname.bv_val; - switch ( ml->sml_op ) { - case LDAP_MOD_ADD: - fprintf( fp, "add: %s\n", type ); - break; - - case LDAP_MOD_DELETE: - fprintf( fp, "delete: %s\n", type ); - break; - - case LDAP_MOD_REPLACE: - fprintf( fp, "replace: %s\n", type ); - break; - - case LDAP_MOD_INCREMENT: - fprintf( fp, "increment: %s\n", type ); - break; + dohdr = 0; } - if ( ocs == 2 ) { - int i; - struct berval vals[2]; - vals[1].bv_val = NULL; - vals[1].bv_len = 0; - for ( i=0; ml->sml_bvalues[i].bv_val; i++ ) { - int match = 0; - for ( an = ri->ri_attrs; an->an_name.bv_val; an++ ) { - if ( an->an_oc - && ml->sml_bvalues[i].bv_len == an->an_name.bv_len - && !strcasecmp(ml->sml_bvalues[i].bv_val, - an->an_name.bv_val ) ) { - match = 1 ^ an->an_oc_exclude; - break; - } - } - match ^= ri->ri_exclude; - if ( match ) { - vals[0] = an->an_name; - print_vals( fp, &ml->sml_desc->ad_cname, vals ); - } - } - } else if ( ml->sml_bvalues ) { + fprintf( fp, "%s: %s\n", did, type ); + if ( ml->sml_bvalues ) { print_vals( fp, &ml->sml_desc->ad_cname, ml->sml_bvalues ); } fprintf( fp, "-\n" ); @@ -421,9 +356,7 @@ replog1( break; case LDAP_REQ_ADD: - fprintf( fp, "changetype: add\n" ); - a = first ? first : op->ora_e->e_attrs; - for ( ; a != NULL; a=a->a_next ) { + for ( a = op->ora_e->e_attrs ; a != NULL; a=a->a_next ) { if ( ri && ri->ri_attrs ) { int is_in = ad_inlist( a->a_desc, ri->ri_attrs ); if ( ( !is_in && !ri->ri_exclude ) || ( is_in && ri->ri_exclude ) ) { @@ -436,9 +369,6 @@ replog1( */ if ( a->a_desc == slap_schema.si_ad_objectClass ) { int i, ocs = 0; - struct berval vals[2]; - vals[1].bv_val = NULL; - vals[1].bv_len = 0; for ( i=0; a->a_vals[i].bv_val; i++ ) { int match = 0; for ( an = ri->ri_attrs; an->an_name.bv_val; an++ ) { @@ -454,6 +384,11 @@ replog1( } match ^= ri->ri_exclude; if ( ocs && match ) { + if ( dohdr ) { + rephdr( ri, op, fp, now ); + fprintf( fp, "changetype: add\n" ); + dohdr = 0; + } vals[0] = an->an_name; print_vals( fp, &a->a_desc->ad_cname, vals ); } @@ -461,15 +396,22 @@ replog1( if ( ocs ) continue; } } + if ( dohdr ) { + rephdr( ri, op, fp, now ); + fprintf( fp, "changetype: add\n" ); + dohdr = 0; + } print_vals( fp, &a->a_desc->ad_cname, a->a_vals ); } break; case LDAP_REQ_DELETE: + rephdr( ri, op, fp, now ); fprintf( fp, "changetype: delete\n" ); break; case LDAP_REQ_MODRDN: + rephdr( ri, op, fp, now ); fprintf( fp, "changetype: modrdn\n" ); fprintf( fp, "newrdn: %s\n", op->orr_newrdn.bv_val ); fprintf( fp, "deleteoldrdn: %d\n", op->orr_deleteoldrdn ? 1 : 0 ); -- 2.39.5