X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fslapadd.c;h=8823c6009bec788b7cc9ab2008e9f0adb33c0f7c;hb=a05cbba77a94875ac00c207344d819513ff6499d;hp=d975034313f1696bcc9b29f647347dcab4f2fc96;hpb=f719c364c59abed050e0e916345c21b0b127957c;p=openldap
diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index d975034313..8823c6009b 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-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* Portions Copyright 2003 IBM Corporation.
* All rights reserved.
@@ -40,8 +40,7 @@
#include "slapcommon.h"
-static char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
-static char maxcsnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE * ( SLAP_SYNC_SID_MAX + 1 ) ];
+static char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
int
slapadd( int argc, char **argv )
@@ -53,21 +52,16 @@ slapadd( int argc, char **argv )
const char *progname = "slapadd";
struct berval csn;
- struct berval maxcsn[ SLAP_SYNC_SID_MAX + 1 ];
- unsigned long sid;
+ unsigned long sid = SLAP_SYNC_SID_MAX + 1;
struct berval bvtext;
- Attribute *attr;
- Entry *ctxcsn_e;
- ID ctxcsn_id, id;
+ ID id;
OperationBuffer opbuf;
Operation *op;
- int match;
int checkvals;
- int lineno, nextline;
+ int lineno, nextline, ldifrc;
int lmax;
int rc = EXIT_SUCCESS;
- int manage = 0;
int enable_meter = 0;
lutil_meter_t meter;
@@ -103,6 +97,14 @@ slapadd( int argc, char **argv )
checkvals = (slapMode & SLAP_TOOL_QUICK) ? 0 : 1;
+ /* do not check values in quick mode */
+ if ( slapMode & SLAP_TOOL_QUICK ) {
+ if ( slapMode & SLAP_TOOL_VALUE_CHECK ) {
+ fprintf( stderr, "%s: value-check incompatible with quick mode; disabled.\n", progname );
+ slapMode &= ~SLAP_TOOL_VALUE_CHECK;
+ }
+ }
+
lmax = 0;
nextline = 0;
@@ -117,13 +119,7 @@ slapadd( int argc, char **argv )
exit( EXIT_FAILURE );
}
- if ( update_ctxcsn ) {
- 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;
- }
- }
+ (void)slap_tool_update_ctxcsn_init();
if ( enable_meter
#ifdef LDAP_DEBUG
@@ -142,8 +138,10 @@ slapadd( int argc, char **argv )
}
/* nextline is the line number of the end of the current entry */
- for( lineno=1; ldif_read_record( ldiffp, &nextline, &buf, &lmax );
- lineno=nextline+1 ) {
+ for( lineno=1; ( ldifrc = ldif_read_record( ldiffp, &nextline, &buf, &lmax )) > 0;
+ lineno=nextline+1 )
+ {
+ BackendDB *bd;
Entry *e;
if ( lineno < jumpline )
@@ -173,9 +171,28 @@ slapadd( int argc, char **argv )
/* make sure the DN is not empty */
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 );
+ !BER_BVISEMPTY( be->be_nsuffix ))
+ {
+ fprintf( stderr, "%s: line %d: "
+ "cannot add entry with empty dn=\"%s\"",
+ progname, lineno, e->e_dn );
+ bd = select_backend( &e->e_nname, nosubordinates );
+ if ( bd ) {
+ BackendDB *bdtmp;
+ int dbidx = 0;
+ LDAP_STAILQ_FOREACH( bdtmp, &backendDB, be_next ) {
+ if ( bdtmp == bd ) break;
+ dbidx++;
+ }
+
+ assert( bdtmp != NULL );
+
+ fprintf( stderr, "; did you mean to use database #%d (%s)?",
+ dbidx,
+ bd->be_suffix[0].bv_val );
+
+ }
+ fprintf( stderr, "\n" );
rc = EXIT_FAILURE;
entry_free( e );
if( continuemode ) continue;
@@ -183,56 +200,44 @@ slapadd( int argc, char **argv )
}
/* check backend */
- if( select_backend( &e->e_nname, nosubordinates )
- != be )
- {
+ bd = select_backend( &e->e_nname, nosubordinates );
+ if ( bd != be ) {
fprintf( stderr, "%s: line %d: "
- "database (%s) not configured to hold \"%s\"\n",
+ "database #%d (%s) not configured to hold \"%s\"",
progname, lineno,
- be ? be->be_suffix[0].bv_val : "",
+ dbnum,
+ be->be_suffix[0].bv_val,
e->e_dn );
- fprintf( stderr, "%s: line %d: "
- "database (%s) not configured to hold \"%s\"\n",
- progname, lineno,
- be ? be->be_nsuffix[0].bv_val : "",
- e->e_ndn );
+ if ( bd ) {
+ BackendDB *bdtmp;
+ int dbidx = 0;
+ LDAP_STAILQ_FOREACH( bdtmp, &backendDB, be_next ) {
+ if ( bdtmp == bd ) break;
+ dbidx++;
+ }
+
+ assert( bdtmp != NULL );
+
+ fprintf( stderr, "; did you mean to use database #%d (%s)?",
+ dbidx,
+ bd->be_suffix[0].bv_val );
+
+ } else {
+ fprintf( stderr, "; no database configured for that naming context" );
+ }
+ fprintf( stderr, "\n" );
rc = EXIT_FAILURE;
entry_free( e );
if( continuemode ) continue;
break;
}
- {
- Attribute *oc = attr_find( e->e_attrs,
- slap_schema.si_ad_objectClass );
-
- if( oc == NULL ) {
- fprintf( stderr, "%s: dn=\"%s\" (line=%d): %s\n",
- progname, e->e_dn, lineno,
- "no objectClass attribute");
- rc = EXIT_FAILURE;
- entry_free( e );
- if( continuemode ) continue;
- break;
- }
-
- /* check schema */
- op->o_bd = be;
-
- if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
- rc = entry_schema_check( op, e, NULL, manage, 1, 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;
- }
- textbuf[ 0 ] = '\0';
- }
+ rc = slap_tool_entry_check( progname, op, e, lineno, &text, textbuf, textlen );
+ if ( rc != LDAP_SUCCESS ) {
+ rc = EXIT_FAILURE;
+ entry_free( e );
+ if( continuemode ) continue;
+ break;
}
if ( SLAP_LASTMOD(be) ) {
@@ -246,13 +251,20 @@ slapadd( int argc, char **argv )
struct berval nname;
char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+ enum {
+ GOT_NONE = 0x0,
+ GOT_CSN = 0x1,
+ GOT_UUID = 0x2,
+ GOT_ALL = (GOT_CSN|GOT_UUID)
+ } got = GOT_ALL;
+
vals[1].bv_len = 0;
vals[1].bv_val = NULL;
nvals[1].bv_len = 0;
nvals[1].bv_val = NULL;
- csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), csnsid, 0 );
+ csn.bv_len = ldap_pvt_csnstr( csnbuf, sizeof( csnbuf ), csnsid, 0 );
csn.bv_val = csnbuf;
timestamp.bv_val = timebuf;
@@ -271,6 +283,7 @@ slapadd( int argc, char **argv )
if( attr_find( e->e_attrs, slap_schema.si_ad_entryUUID )
== NULL )
{
+ got &= ~GOT_UUID;
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 );
@@ -294,6 +307,7 @@ slapadd( int argc, char **argv )
if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN )
== NULL )
{
+ got &= ~GOT_CSN;
vals[0] = csn;
attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL );
}
@@ -313,37 +327,20 @@ slapadd( int argc, char **argv )
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 );
- 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 {
- 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;
- }
- }
+ if ( SLAP_SINGLE_SHADOW(be) && got != GOT_ALL ) {
+ char buf[SLAP_TEXT_BUFLEN];
+
+ snprintf( buf, sizeof(buf),
+ "%s%s%s",
+ ( !(got & GOT_UUID) ? slap_schema.si_ad_entryUUID->ad_cname.bv_val : "" ),
+ ( !(got & GOT_CSN) ? "," : "" ),
+ ( !(got & GOT_CSN) ? slap_schema.si_ad_entryCSN->ad_cname.bv_val : "" ) );
+
+ Debug( LDAP_DEBUG_ANY, "%s: warning, missing attrs %s from entry dn=\"%s\"\n",
+ progname, buf, e->e_name.bv_val );
}
+
+ sid = slap_tool_update_ctxcsn_check( progname, e );
}
if ( !dryrun ) {
@@ -369,6 +366,9 @@ slapadd( int argc, char **argv )
entry_free( e );
}
+ if ( ldifrc < 0 )
+ rc = EXIT_FAILURE;
+
bvtext.bv_len = textlen;
bvtext.bv_val = textbuf;
bvtext.bv_val[0] = '\0';
@@ -378,94 +378,8 @@ slapadd( int argc, char **argv )
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 {
- 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 ) {
- 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 {
- change = 1;
- }
-
- 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);
- rc = EXIT_FAILURE;
- } else if ( verbose ) {
- fprintf( stderr, "modified: \"%s\" (%08lx)\n",
- e->e_dn, (long) ctxcsn_id );
- }
- }
- entry_free( e );
- }
- }
+ if ( rc == EXIT_SUCCESS ) {
+ rc = slap_tool_update_ctxcsn( progname, sid, &bvtext );
}
ch_free( buf );