X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapadd.c;h=588fa2a282c6e1078f4bac4d6853c6a1a07ae95c;hb=a17df0e810578d593808c6afeb0cdea55a65633c;hp=ac66a3f00864a38ed6b9f74d2b03b16b33869053;hpb=feeeabcd682e39d0c871e9ee1821e0a1ee99c3d0;p=openldap

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index ac66a3f008..588fa2a282 100644
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -44,32 +44,41 @@ static char maxcsnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
 int
 slapadd( int argc, char **argv )
 {
-	char		*buf = NULL;
-	int         lineno;
-	int         lmax;
-	int			rc = EXIT_SUCCESS;
-
+	char *buf = NULL;
 	const char *text;
 	char textbuf[SLAP_TEXT_BUFLEN] = { '\0' };
 	size_t textlen = sizeof textbuf;
 	const char *progname = "slapadd";
-	int manage = 0;	
 
 	struct berval csn;
 	struct berval maxcsn;
-	int match;
+	struct berval bvtext;
 	Attribute *attr;
 	Entry *ctxcsn_e;
 	ID	ctxcsn_id, id;
+	OperationBuffer opbuf;
+	Operation *op;
+
+	int match;
 	int ret;
-	struct berval bvtext;
-	int i, checkvals;
-	struct berval mc;
+	int checkvals;
+	int lineno;
+	int lmax;
+	int rc = EXIT_SUCCESS;
+	int manage = 0;	
+
 	slap_tool_init( progname, SLAPADD, argc, argv );
 
+	memset( &opbuf, 0, sizeof(opbuf) );
+	op = (Operation *) &opbuf;
+
 	if( !be->be_entry_open ||
 		!be->be_entry_close ||
-		!be->be_entry_put )
+		!be->be_entry_put ||
+		(update_ctxcsn &&
+		 (!be->be_dn2id_get ||
+		  !be->be_id2entry_get ||
+		  !be->be_entry_modify)) )
 	{
 		fprintf( stderr, "%s: database doesn't support necessary operations.\n",
 			progname );
@@ -182,7 +191,9 @@ slapadd( int argc, char **argv )
 			}
 
 			/* check schema */
-			rc = entry_schema_check( be, e, NULL, manage,
+			op->o_bd = be;
+
+			rc = entry_schema_check( op, e, NULL, manage,
 				&text, textbuf, textlen );
 
 			if( rc != LDAP_SUCCESS ) {
@@ -196,7 +207,6 @@ slapadd( int argc, char **argv )
 		}
 
 		if ( SLAP_LASTMOD(be) ) {
-			struct tm *ltm;
 			time_t now = slap_get_time();
 			char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
 			struct berval vals[ 2 ];
@@ -213,14 +223,13 @@ slapadd( int argc, char **argv )
 			nvals[1].bv_len = 0;
 			nvals[1].bv_val = NULL;
 
-			ltm = gmtime(&now);
-			lutil_gentime( timebuf, sizeof(timebuf), ltm );
-
 			csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 );
 			csn.bv_val = csnbuf;
 
 			timestamp.bv_val = timebuf;
-			timestamp.bv_len = strlen(timebuf);
+			timestamp.bv_len = sizeof(timebuf);
+
+			slap_timestamp( &now, &timestamp );
 
 			if ( BER_BVISEMPTY( &be->be_rootndn ) ) {
 				BER_BVSTR( &name, SLAPD_ANONYMOUS );
@@ -304,19 +313,15 @@ slapadd( int argc, char **argv )
 				if( continuemode ) continue;
 				break;
 			}
-		}
-
-		if ( verbose ) {
-			if ( dryrun ) {
-				fprintf( stderr, "added: \"%s\"\n",
-					e->e_dn );
-			} else {
+			if ( verbose )
 				fprintf( stderr, "added: \"%s\" (%08lx)\n",
 					e->e_dn, (long) id );
-			}
+		} else {
+			if ( verbose )
+				fprintf( stderr, "added: \"%s\"\n",
+					e->e_dn );
 		}
 
-done:;
 		entry_free( e );
 	}