X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapadd.c;h=7aa4ee29310d9b4f277535fc4905b2a23e08cb52;hb=173330187ef1a4139e2e4c4fb30ad23832e40f77;hp=4b2223f3c74cc6456c4e9e46ebf962f084f033f2;hpb=123668e2410e6644c5054885a05c0d1c9c717bb8;p=openldap diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c index 4b2223f3c7..7aa4ee2931 100644 --- a/servers/slapd/slapadd.c +++ b/servers/slapd/slapadd.c @@ -40,61 +40,6 @@ static char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ]; static char maxcsnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ]; -static const char *progname = "slapadd"; - -static ldap_pvt_thread_cond_t put_cond; -static ldap_pvt_thread_mutex_t put_mutex; -static Entry *put_e; -static struct berval bvtext; -static int put_lineno; -static int put_rc; - -static int use_thread = 0; /*FIXME need a new switch for this */ - -static void *do_put(void *ptr) -{ - ID id; - Entry *e; - int lineno; - - ldap_pvt_thread_mutex_lock( &put_mutex ); - do { - ldap_pvt_thread_cond_wait( &put_cond, &put_mutex ); - if ( put_rc ) { - break; - } - - e = put_e; - lineno = put_lineno; - - if ( !dryrun ) { - id = be->be_entry_put( be, e, &bvtext ); - if( id == NOID ) { - fprintf( stderr, "%s: could not add entry dn=\"%s\" " - "(line=%d): %s\n", progname, e->e_dn, - lineno, bvtext.bv_val ); - entry_free( e ); - if ( continuemode ) continue; - put_rc = EXIT_FAILURE; - break; - } - } - - if ( verbose ) { - if ( dryrun ) { - fprintf( stderr, "added: \"%s\"\n", - e->e_dn ); - } else { - fprintf( stderr, "added: \"%s\" (%08lx)\n", - e->e_dn, (long) id ); - } - } - - entry_free( e ); - - } while (1); - ldap_pvt_thread_mutex_unlock( &put_mutex ); -} int slapadd( int argc, char **argv ) @@ -107,6 +52,7 @@ slapadd( int argc, char **argv ) const char *text; char textbuf[SLAP_TEXT_BUFLEN] = { '\0' }; size_t textlen = sizeof textbuf; + const char *progname = "slapadd"; struct berval csn; struct berval maxcsn; @@ -115,10 +61,9 @@ slapadd( int argc, char **argv ) Entry *ctxcsn_e; ID ctxcsn_id, id; int ret; - int i; + struct berval bvtext; + int i, checkvals; struct berval mc; - ldap_pvt_thread_t put_tid; - slap_tool_init( progname, SLAPADD, argc, argv ); if( !be->be_entry_open || @@ -135,17 +80,7 @@ slapadd( int argc, char **argv ) } } - if ( use_thread ) { - ldap_pvt_thread_initialize(); - ldap_pvt_thread_cond_init( &put_cond ); - ldap_pvt_thread_mutex_init( &put_mutex ); - rc = ldap_pvt_thread_create( &put_tid, 0, do_put, NULL ); - if ( rc ) { - fprintf( stderr, "%s: could not create thread.\n", - progname ); - exit( EXIT_FAILURE ); - } - } + checkvals = (slapMode & SLAP_TOOL_QUICK) ? 0 : 1; lmax = 0; lineno = 0; @@ -162,7 +97,7 @@ slapadd( int argc, char **argv ) } while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) { - Entry *e = str2entry( buf ); + Entry *e = str2entry2( buf, checkvals ); /* * Initialize text buffer @@ -180,7 +115,8 @@ slapadd( int argc, char **argv ) } /* make sure the DN is not empty */ - if( !e->e_nname.bv_len ) { + if( BER_BVISEMPTY( &e->e_nname ) && + !BER_BVISEMPTY( be->be_nsuffix )) { fprintf( stderr, "%s: empty dn=\"%s\" (line=%d)\n", progname, e->e_dn, lineno ); rc = EXIT_FAILURE; @@ -226,9 +162,9 @@ slapadd( int argc, char **argv ) } if( sc == NULL ) { - struct berval vals[2]; + struct berval val; - rc = structural_class( oc->a_vals, vals, + rc = structural_class( oc->a_vals, &val, NULL, &text, textbuf, textlen ); if( rc != LDAP_SUCCESS ) { @@ -240,11 +176,7 @@ slapadd( int argc, char **argv ) break; } - vals[1].bv_len = 0; - vals[1].bv_val = NULL; - - attr_merge( e, slap_schema.si_ad_structuralObjectClass, - vals, NULL /* FIXME */ ); + attr_merge_one( e, slap_schema.si_ad_structuralObjectClass, &val, NULL ); } /* check schema */ @@ -300,8 +232,7 @@ slapadd( int argc, char **argv ) { vals[0].bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) ); vals[0].bv_val = uuidbuf; - attr_merge_normalize_one( e, - slap_schema.si_ad_entryUUID, vals, NULL ); + attr_merge_normalize_one( e, slap_schema.si_ad_entryUUID, vals, NULL ); } if( attr_find( e->e_attrs, slap_schema.si_ad_creatorsName ) @@ -359,19 +290,6 @@ slapadd( int argc, char **argv ) } } - if ( use_thread ) { - ldap_pvt_thread_mutex_lock( &put_mutex ); - if (put_rc) { - rc = put_rc; - break; - } - put_e = e; - put_lineno = lineno; - ldap_pvt_thread_cond_signal( &put_cond ); - ldap_pvt_thread_mutex_unlock( &put_mutex ); - continue; - } - if ( !dryrun ) { id = be->be_entry_put( be, e, &bvtext ); if( id == NOID ) { @@ -395,19 +313,10 @@ slapadd( int argc, char **argv ) } } +done:; entry_free( e ); } - if ( use_thread ) { - if ( !put_rc ) { - put_rc = EXIT_FAILURE; - ldap_pvt_thread_mutex_lock( &put_mutex ); - ldap_pvt_thread_cond_signal( &put_cond ); - ldap_pvt_thread_mutex_unlock( &put_mutex ); - } - ldap_pvt_thread_join( put_tid, NULL ); - } - bvtext.bv_len = textlen; bvtext.bv_val = textbuf; bvtext.bv_val[0] = '\0'; @@ -422,15 +331,21 @@ slapadd( int argc, char **argv ) if ( ret == LDAP_SUCCESS ) { attr = attr_find( ctxcsn_e->e_attrs, slap_schema.si_ad_contextCSN ); - 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 ( 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; + } + } else { + match = 1; + attr_merge_one( ctxcsn_e, slap_schema.si_ad_contextCSN, &maxcsn, NULL ); + } 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; - ctxcsn_id = be->be_entry_modify( be, ctxcsn_e, &bvtext ); if( ctxcsn_id == NOID ) { fprintf( stderr, "%s: could not modify ctxcsn\n",