X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Frepl.c;h=270f9a11f34ae540e31964b35a2b7051b833a1b8;hb=a17df0e810578d593808c6afeb0cdea55a65633c;hp=eb20c6681e516fd54877b40ab72f8c3e921642f9;hpb=d31230f859fcc2fdb5fc05214fc1d933266be81a;p=openldap diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c index eb20c6681e..270f9a11f3 100644 --- a/servers/slapd/repl.c +++ b/servers/slapd/repl.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2003 The OpenLDAP Foundation. + * Copyright 1998-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,14 +41,14 @@ int add_replica_info( - Backend *be, - const char *host -) + Backend *be, + const char *uri, + const char *host ) { int i = 0; - assert( be ); - assert( host ); + assert( be != NULL ); + assert( host != NULL ); if ( be->be_replica != NULL ) { for ( ; be->be_replica[ i ] != NULL; i++ ); @@ -59,7 +59,8 @@ add_replica_info( be->be_replica[ i ] = ch_calloc( sizeof( struct slap_replica_info ), 1 ); - be->be_replica[ i ]->ri_host = ch_strdup( host ); + ber_str2bv( uri, 0, 0, &be->be_replica[ i ]->ri_bindconf.sb_uri ); + be->be_replica[ i ]->ri_host = host; be->be_replica[ i ]->ri_nsuffix = NULL; be->be_replica[ i ]->ri_attrs = NULL; be->be_replica[ i + 1 ] = NULL; @@ -67,6 +68,42 @@ add_replica_info( return( i ); } +int +destroy_replica_info( + Backend *be ) +{ + int i = 0; + + assert( be != NULL ); + + if ( be->be_replica == NULL ) { + return 0; + } + + for ( ; be->be_replica[ i ] != NULL; i++ ) { + ber_bvarray_free( be->be_replica[ i ]->ri_nsuffix ); + + if ( be->be_replica[ i ]->ri_attrs ) { + AttributeName *an = be->be_replica[ i ]->ri_attrs; + int j; + + for ( j = 0; !BER_BVISNULL( &an[ j ].an_name ); j++ ) + { + ch_free( an[ j ].an_name.bv_val ); + } + ch_free( an ); + } + + bindconf_free( &be->be_replica[ i ]->ri_bindconf ); + + ch_free( be->be_replica[ i ] ); + } + + ch_free( be->be_replica ); + + return 0; +} + int add_replica_suffix( Backend *be, @@ -116,51 +153,32 @@ add_replica_attrs( return ( be->be_replica[nr]->ri_attrs == NULL ); } -static struct timestamp { - long time; - long seq; -} oldstamp; - 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 -repstamp( Operation *op ) -{ - ldap_pvt_thread_mutex_lock( &replog_mutex ); - op->o_time = slap_get_time(); - if ( op->o_time == oldstamp.time ) { - op->o_tseq = ++oldstamp.seq; - } else { - oldstamp.time = op->o_time; - oldstamp.seq = 0; - op->o_tseq = 0; - } - ldap_pvt_thread_mutex_unlock( &replog_mutex ); -} +replog1( struct slap_replica_info *ri, Operation *op, FILE *fp, long now); void replog( Operation *op ) { - Modifications *ml = NULL; - Attribute *a = NULL; FILE *fp, *lfp; int i; /* undef NO_LOG_WHEN_NO_REPLICAS */ #ifdef NO_LOG_WHEN_NO_REPLICAS int count = 0; -#endif +#endif /* NO_LOG_WHEN_NO_REPLICAS */ int subsets = 0; + long now = slap_get_time(); + char *replogfile; - if ( op->o_bd->be_replogfile == NULL && replogfile == NULL ) { + replogfile = op->o_bd->be_replogfile ? op->o_bd->be_replogfile : + frontendDB->be_replogfile; + if ( !replogfile ) { return; } ldap_pvt_thread_mutex_lock( &replog_mutex ); - if ( (fp = lock_fopen( op->o_bd->be_replogfile ? op->o_bd->be_replogfile : - replogfile, "a", &lfp )) == NULL ) { + if ( (fp = lock_fopen( replogfile, "a", &lfp )) == NULL ) { ldap_pvt_thread_mutex_unlock( &replog_mutex ); return; } @@ -194,7 +212,7 @@ replog( Operation *op ) fprintf( fp, "replica: %s\n", op->o_bd->be_replica[i]->ri_host ); #ifdef NO_LOG_WHEN_NO_REPLICAS ++count; -#endif +#endif /* NO_LOG_WHEN_NO_REPLICAS */ } #ifdef NO_LOG_WHEN_NO_REPLICAS @@ -206,9 +224,9 @@ replog( Operation *op ) return; } -#endif +#endif /* NO_LOG_WHEN_NO_REPLICAS */ - replog1( NULL, op, fp ); + replog1( NULL, op, fp, now ); if ( subsets > 0 ) { for ( i = subsets - 1; op->o_bd->be_replica[i] != NULL; i++ ) { @@ -245,7 +263,7 @@ replog( Operation *op ) /* Other operations were logged in the first pass */ continue; } - replog1( op->o_bd->be_replica[i], op, fp ); + replog1( op->o_bd->be_replica[i], op, fp, now ); } } @@ -257,13 +275,14 @@ static void rephdr( struct slap_replica_info *ri, Operation *op, - FILE *fp + FILE *fp, + long now ) { if ( ri ) { fprintf( fp, "replica: %s\n", ri->ri_host ); } - fprintf( fp, "time: %ld.%ld\n", op->o_time, op->o_tseq ); + fprintf( fp, "time: %ld\n", now ); fprintf( fp, "dn: %s\n", op->o_req_dn.bv_val ); } @@ -271,7 +290,8 @@ static void replog1( struct slap_replica_info *ri, Operation *op, - FILE *fp + FILE *fp, + long now ) { Modifications *ml; @@ -291,7 +311,7 @@ replog1( case LDAP_REQ_MODIFY: for ( ml = op->orm_modlist; ml != NULL; ml = ml->sml_next ) { - char *did, *type = ml->sml_desc->ad_cname.bv_val; + char *did = NULL, *type = ml->sml_desc->ad_cname.bv_val; switch ( ml->sml_op ) { case LDAP_MOD_ADD: did = "add"; break; @@ -308,29 +328,54 @@ replog1( if ( ri && ri->ri_attrs ) { int is_in = ad_inlist( ml->sml_desc, ri->ri_attrs ); + /* skip if: + * 1) the attribute is not in the list, + * and it's not an exclusion list + * 2) the attribute is in the list + * and it's an exclusion list, + * and either the objectClass attribute + * has already been dealt with or + * this is not the objectClass attr + */ if ( ( !is_in && !ri->ri_exclude ) - || ( is_in && ri->ri_exclude ) ) + || ( ( is_in && ri->ri_exclude ) + && ( !ocs || ml->sml_desc != slap_schema.si_ad_objectClass ) ) ) { continue; } + /* If this is objectClass, see if the value is included * in any subset, otherwise drop it. */ if ( ocs && ml->sml_desc == slap_schema.si_ad_objectClass - && ml->sml_bvalues ) { + && ml->sml_values ) + { int i, first = 1; if ( ocs == -1 ) ocs = 0; - for ( i=0; ml->sml_bvalues[i].bv_val; i++ ) { + for ( i=0; ml->sml_values[i].bv_val; i++ ) { int match = 0; for ( an = ri->ri_attrs; an->an_name.bv_val; an++ ) { if ( an->an_oc ) { + struct berval bv = an->an_name; + ocs = 1; match |= an->an_oc_exclude; - if ( ml->sml_bvalues[i].bv_len == an->an_name.bv_len - && !strcasecmp(ml->sml_bvalues[i].bv_val, - an->an_name.bv_val ) ) { + + switch ( bv.bv_val[ 0 ] ) { + case '@': + case '+': + case '!': + bv.bv_val++; + bv.bv_len--; + break; + } + + if ( ml->sml_values[i].bv_len == bv.bv_len + && !strcasecmp(ml->sml_values[i].bv_val, + bv.bv_val ) ) + { match = !an->an_oc_exclude; break; } @@ -345,7 +390,7 @@ replog1( /* Found a match, log it */ if ( match ) { if ( dohdr ) { - rephdr( ri, op, fp ); + rephdr( ri, op, fp, now ); fprintf( fp, "changetype: modify\n" ); dohdr = 0; } @@ -353,7 +398,7 @@ replog1( fprintf( fp, "%s: %s\n", did, type ); first = 0; } - vals[0] = an->an_name; + vals[0] = a->a_nvals[i]; print_vals( fp, &ml->sml_desc->ad_cname, vals ); ocs = 2; } @@ -369,13 +414,13 @@ replog1( } } if ( dohdr ) { - rephdr( ri, op, fp ); + rephdr( ri, op, fp, now ); fprintf( fp, "changetype: modify\n" ); dohdr = 0; } fprintf( fp, "%s: %s\n", did, type ); - if ( ml->sml_bvalues ) { - print_vals( fp, &ml->sml_desc->ad_cname, ml->sml_bvalues ); + if ( ml->sml_values ) { + print_vals( fp, &ml->sml_desc->ad_cname, ml->sml_values ); } fprintf( fp, "-\n" ); } @@ -385,7 +430,20 @@ replog1( 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 ) ) { + + /* skip if: + * 1) the attribute is not in the list, + * and it's not an exclusion list + * 2) the attribute is in the list + * and it's an exclusion list, + * and either the objectClass attribute + * has already been dealt with or + * this is not the objectClass attr + */ + if ( ( !is_in && !ri->ri_exclude ) + || ( ( is_in && ri->ri_exclude ) + && ( !ocs || a->a_desc != slap_schema.si_ad_objectClass ) ) ) + { continue; } @@ -402,11 +460,24 @@ replog1( int match = 0; for ( an = ri->ri_attrs; an->an_name.bv_val; an++ ) { if ( an->an_oc ) { + struct berval bv = an->an_name; + ocs = 1; match |= an->an_oc_exclude; - if ( a->a_vals[i].bv_len == an->an_name.bv_len + + switch ( bv.bv_val[ 0 ] ) { + case '@': + case '+': + case '!': + bv.bv_val++; + bv.bv_len--; + break; + } + + if ( a->a_vals[i].bv_len == bv.bv_len && !strcasecmp(a->a_vals[i].bv_val, - an->an_name.bv_val ) ) { + bv.bv_val ) ) + { match = !an->an_oc_exclude; break; } @@ -417,11 +488,11 @@ replog1( match ^= ri->ri_exclude; if ( match ) { if ( dohdr ) { - rephdr( ri, op, fp ); + rephdr( ri, op, fp, now ); fprintf( fp, "changetype: add\n" ); dohdr = 0; } - vals[0] = an->an_name; + vals[0] = a->a_nvals[i]; print_vals( fp, &a->a_desc->ad_cname, vals ); } } @@ -429,7 +500,7 @@ replog1( } } if ( dohdr ) { - rephdr( ri, op, fp ); + rephdr( ri, op, fp, now ); fprintf( fp, "changetype: add\n" ); dohdr = 0; } @@ -438,12 +509,12 @@ replog1( break; case LDAP_REQ_DELETE: - rephdr( ri, op, fp ); + rephdr( ri, op, fp, now ); fprintf( fp, "changetype: delete\n" ); break; case LDAP_REQ_MODRDN: - rephdr( ri, op, fp ); + 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 );