X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapadd.c;h=d975034313f1696bcc9b29f647347dcab4f2fc96;hb=6d1aa51604a7ae9c44287af5201afc9f43b5e91e;hp=6a01077dae327813f45dcb482c4aafadb0acf54b;hpb=35f6ef6fd6a94862ef744ebd2651efd455b436df;p=openldap diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c index 6a01077dae..d975034313 100644 --- a/servers/slapd/slapadd.c +++ b/servers/slapd/slapadd.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2006 The OpenLDAP Foundation. + * Copyright 1998-2009 The OpenLDAP Foundation. * Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 2003 IBM Corporation. * All rights reserved. @@ -35,11 +35,13 @@ #include #include #include +#include +#include #include "slapcommon.h" static char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ]; -static char maxcsnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ]; +static char maxcsnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE * ( SLAP_SYNC_SID_MAX + 1 ) ]; int slapadd( int argc, char **argv ) @@ -51,7 +53,8 @@ slapadd( int argc, char **argv ) const char *progname = "slapadd"; struct berval csn; - struct berval maxcsn; + struct berval maxcsn[ SLAP_SYNC_SID_MAX + 1 ]; + unsigned long sid; struct berval bvtext; Attribute *attr; Entry *ctxcsn_e; @@ -60,24 +63,32 @@ slapadd( int argc, char **argv ) Operation *op; int match; - int ret; int checkvals; int lineno, nextline; int lmax; int rc = EXIT_SUCCESS; int manage = 0; + int enable_meter = 0; + lutil_meter_t meter; + struct stat stat_buf; + + /* default "000" */ + csnsid = 0; + + if ( isatty (2) ) enable_meter = 1; slap_tool_init( progname, SLAPADD, argc, argv ); memset( &opbuf, 0, sizeof(opbuf) ); - op = (Operation *) &opbuf; + op = &opbuf.ob_op; + op->o_hdr = &opbuf.ob_hdr; if( !be->be_entry_open || !be->be_entry_close || !be->be_entry_put || (update_ctxcsn && (!be->be_dn2id_get || - !be->be_id2entry_get || + !be->be_entry_get || !be->be_entry_modify)) ) { fprintf( stderr, "%s: database doesn't support necessary operations.\n", @@ -95,6 +106,11 @@ slapadd( int argc, char **argv ) lmax = 0; nextline = 0; + /* enforce schema checking unless not disabled */ + if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) { + SLAP_DBFLAGS(be) &= ~(SLAP_DBFLAG_NO_SCHEMA_CHECK); + } + if( !dryrun && be->be_entry_open( be, 1 ) != 0 ) { fprintf( stderr, "%s: could not open database.\n", progname ); @@ -102,8 +118,27 @@ slapadd( int argc, char **argv ) } if ( update_ctxcsn ) { - maxcsn.bv_val = maxcsnbuf; - maxcsn.bv_len = 0; + maxcsn[ 0 ].bv_val = maxcsnbuf; + for ( sid = 1; sid <= SLAP_SYNC_SID_MAX; sid++ ) { + maxcsn[ sid ].bv_val = maxcsn[ sid - 1 ].bv_val + LDAP_LUTIL_CSNSTR_BUFSIZE; + maxcsn[ sid ].bv_len = 0; + } + } + + if ( enable_meter +#ifdef LDAP_DEBUG + /* tools default to "none" */ + && slap_debug == LDAP_DEBUG_NONE +#endif + && !fstat ( fileno ( ldiffp->fp ), &stat_buf ) + && S_ISREG(stat_buf.st_mode) ) { + enable_meter = !lutil_meter_open( + &meter, + &lutil_meter_text_display, + &lutil_meter_linear_estimator, + stat_buf.st_size); + } else { + enable_meter = 0; } /* nextline is the line number of the end of the current entry */ @@ -116,6 +151,11 @@ slapadd( int argc, char **argv ) e = str2entry2( buf, checkvals ); + if ( enable_meter ) + lutil_meter_update( &meter, + ftell( ldiffp->fp ), + 0); + /* * Initialize text buffer */ @@ -143,7 +183,7 @@ slapadd( int argc, char **argv ) } /* check backend */ - if( select_backend( &e->e_nname, is_entry_referral(e), nosubordinates ) + if( select_backend( &e->e_nname, nosubordinates ) != be ) { fprintf( stderr, "%s: line %d: " @@ -163,8 +203,6 @@ slapadd( int argc, char **argv ) } { - Attribute *sc = attr_find( e->e_attrs, - slap_schema.si_ad_structuralObjectClass ); Attribute *oc = attr_find( e->e_attrs, slap_schema.si_ad_objectClass ); @@ -178,30 +216,11 @@ slapadd( int argc, char **argv ) break; } - if( sc == NULL ) { - struct berval val; - - rc = structural_class( oc->a_vals, &val, - NULL, &text, textbuf, textlen ); - - if( rc != LDAP_SUCCESS ) { - fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n", - progname, e->e_dn, lineno, rc, text ); - rc = EXIT_FAILURE; - entry_free( e ); - if( continuemode ) continue; - break; - } - - attr_merge_one( e, slap_schema.si_ad_structuralObjectClass, - &val, NULL ); - } - /* check schema */ op->o_bd = be; if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) { - rc = entry_schema_check( op, e, NULL, manage, + rc = entry_schema_check( op, e, NULL, manage, 1, NULL, &text, textbuf, textlen ); if( rc != LDAP_SUCCESS ) { @@ -212,6 +231,7 @@ slapadd( int argc, char **argv ) if( continuemode ) continue; break; } + textbuf[ 0 ] = '\0'; } } @@ -232,7 +252,7 @@ slapadd( int argc, char **argv ) nvals[1].bv_len = 0; nvals[1].bv_val = NULL; - csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 ); + csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), csnsid, 0 ); csn.bv_val = csnbuf; timestamp.bv_val = timebuf; @@ -264,49 +284,64 @@ slapadd( int argc, char **argv ) attr_merge( e, slap_schema.si_ad_creatorsName, vals, nvals ); } - if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName ) + if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp ) == NULL ) { - vals[0] = name; - nvals[0] = nname; - attr_merge( e, slap_schema.si_ad_modifiersName, vals, nvals ); + vals[0] = timestamp; + attr_merge( e, slap_schema.si_ad_createTimestamp, vals, NULL ); } - if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp ) + if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN ) == NULL ) { - vals[0] = timestamp; - attr_merge( e, slap_schema.si_ad_createTimestamp, vals, NULL ); + vals[0] = csn; + attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL ); } - if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp ) + if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName ) == NULL ) { - vals[0] = timestamp; - attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL ); + vals[0] = name; + nvals[0] = nname; + attr_merge( e, slap_schema.si_ad_modifiersName, vals, nvals ); } - if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN ) + if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp ) == NULL ) { - vals[0] = csn; - attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL ); + vals[0] = timestamp; + attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL ); } if ( update_ctxcsn ) { + int rc_sid; + attr = attr_find( e->e_attrs, slap_schema.si_ad_entryCSN ); - if ( maxcsn.bv_len != 0 ) { - match = 0; - value_match( &match, slap_schema.si_ad_entryCSN, - slap_schema.si_ad_entryCSN->ad_type->sat_ordering, - SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX, - &maxcsn, &attr->a_nvals[0], &text ); + assert( attr != NULL ); + + rc_sid = slap_parse_csn_sid( &attr->a_nvals[ 0 ] ); + if ( rc_sid < 0 ) { + Debug( LDAP_DEBUG_ANY, "%s: could not " + "extract SID from entryCSN=%s\n", + progname, attr->a_nvals[ 0 ].bv_val, 0 ); + } else { - match = -1; - } - if ( match < 0 ) { - strcpy( maxcsn.bv_val, attr->a_nvals[0].bv_val ); - maxcsn.bv_len = attr->a_nvals[0].bv_len; + assert( rc_sid <= SLAP_SYNC_SID_MAX ); + + sid = (unsigned)rc_sid; + if ( maxcsn[ sid ].bv_len != 0 ) { + match = 0; + value_match( &match, slap_schema.si_ad_entryCSN, + slap_schema.si_ad_entryCSN->ad_type->sat_ordering, + SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX, + &maxcsn[ sid ], &attr->a_nvals[0], &text ); + } else { + match = -1; + } + if ( match < 0 ) { + strcpy( maxcsn[ sid ].bv_val, attr->a_nvals[0].bv_val ); + maxcsn[ sid ].bv_len = attr->a_nvals[0].bv_len; + } } } } @@ -338,41 +373,97 @@ slapadd( int argc, char **argv ) bvtext.bv_val = textbuf; bvtext.bv_val[0] = '\0'; - if ( rc == EXIT_SUCCESS && update_ctxcsn && !dryrun && maxcsn.bv_len ) { + if ( enable_meter ) { + lutil_meter_update( &meter, ftell( ldiffp->fp ), 1); + lutil_meter_close( &meter ); + } + + if ( rc == EXIT_SUCCESS && update_ctxcsn && !dryrun && sid != SLAP_SYNC_SID_MAX + 1 ) { ctxcsn_id = be->be_dn2id_get( be, be->be_nsuffix ); if ( ctxcsn_id == NOID ) { fprintf( stderr, "%s: context entry is missing\n", progname ); rc = EXIT_FAILURE; } else { - ret = be->be_id2entry_get( be, ctxcsn_id, &ctxcsn_e ); - if ( ret == LDAP_SUCCESS ) { - attr = attr_find( ctxcsn_e->e_attrs, - slap_schema.si_ad_contextCSN ); + ctxcsn_e = be->be_entry_get( be, ctxcsn_id ); + if ( ctxcsn_e != NULL ) { + Entry *e = entry_dup( ctxcsn_e ); + int change; + attr = attr_find( e->e_attrs, slap_schema.si_ad_contextCSN ); if ( attr ) { - value_match( &match, slap_schema.si_ad_entryCSN, - slap_schema.si_ad_entryCSN->ad_type->sat_ordering, - SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX, - &maxcsn, &attr->a_nvals[0], &text ); - if ( match > 0 ) { - AC_MEMCPY( attr->a_vals[0].bv_val, maxcsn.bv_val, maxcsn.bv_len ); - attr->a_vals[0].bv_val[maxcsn.bv_len] = '\0'; - attr->a_vals[0].bv_len = maxcsn.bv_len; + int i; + + change = 0; + + for ( i = 0; !BER_BVISNULL( &attr->a_nvals[ i ] ); i++ ) { + int rc_sid; + + rc_sid = slap_parse_csn_sid( &attr->a_nvals[ i ] ); + if ( rc_sid < 0 ) { + Debug( LDAP_DEBUG_ANY, + "%s: unable to extract SID " + "from #%d contextCSN=%s\n", + progname, i, + attr->a_nvals[ i ].bv_val ); + continue; + } + + assert( rc_sid <= SLAP_SYNC_SID_MAX ); + + sid = (unsigned)rc_sid; + + if ( maxcsn[ sid ].bv_len == 0 ) { + match = -1; + + } else { + value_match( &match, slap_schema.si_ad_entryCSN, + slap_schema.si_ad_entryCSN->ad_type->sat_ordering, + SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX, + &maxcsn[ sid ], &attr->a_nvals[i], &text ); + } + + if ( match > 0 ) { + change = 1; + } else { + AC_MEMCPY( maxcsn[ sid ].bv_val, + attr->a_nvals[ i ].bv_val, + attr->a_nvals[ i ].bv_len ); + maxcsn[ sid ].bv_val[ attr->a_nvals[ i ].bv_len ] = '\0'; + maxcsn[ sid ].bv_len = attr->a_nvals[ i ].bv_len; + } + } + + if ( change ) { + if ( attr->a_nvals != attr->a_vals ) { + ber_bvarray_free( attr->a_nvals ); + } + attr->a_nvals = NULL; + ber_bvarray_free( attr->a_vals ); + attr->a_vals = NULL; + attr->a_numvals = 0; } } else { - match = 1; - attr_merge_one( ctxcsn_e, slap_schema.si_ad_contextCSN, &maxcsn, NULL ); + change = 1; } - if ( match > 0 ) { - ctxcsn_id = be->be_entry_modify( be, ctxcsn_e, &bvtext ); + + if ( change ) { + for ( sid = 0; sid <= SLAP_SYNC_SID_MAX; sid++ ) { + if ( maxcsn[ sid ].bv_len ) { + attr_merge_one( e, slap_schema.si_ad_contextCSN, + &maxcsn[ sid], NULL ); + } + } + + ctxcsn_id = be->be_entry_modify( be, e, &bvtext ); if( ctxcsn_id == NOID ) { fprintf( stderr, "%s: could not modify ctxcsn\n", - progname); + progname); rc = EXIT_FAILURE; } else if ( verbose ) { fprintf( stderr, "modified: \"%s\" (%08lx)\n", - ctxcsn_e->e_dn, (long) ctxcsn_id ); + e->e_dn, (long) ctxcsn_id ); } } + entry_free( e ); } } } @@ -380,6 +471,9 @@ slapadd( int argc, char **argv ) ch_free( buf ); if ( !dryrun ) { + if ( enable_meter ) { + fprintf( stderr, "Closing DB..." ); + } if( be->be_entry_close( be ) ) { rc = EXIT_FAILURE; } @@ -387,9 +481,13 @@ slapadd( int argc, char **argv ) if( be->be_sync ) { be->be_sync( be ); } + if ( enable_meter ) { + fprintf( stderr, "\n" ); + } } - slap_tool_destroy(); + if ( slap_tool_destroy()) + rc = EXIT_FAILURE; return rc; }