fix NOOP return code (ITS#4563; I'll check and confirm it later; NOOP support might...

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 2235c54dbf723064806c16049a4dcf7ddc9d4728..11cf55f371a93a12a7b458070c4d9120079a2421 100644 (file)
--- 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,11 +44,7 @@ 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;
@@ -56,19 +52,33 @@ slapadd( int argc, char **argv )
 
        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 );
@@ -115,7 +125,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;
@@ -144,7 +155,7 @@ slapadd( int argc, char **argv )
                        break;
                }
 
-               if( global_schemacheck ) {
+               {
                        Attribute *sc = attr_find( e->e_attrs,
                                slap_schema.si_ad_structuralObjectClass );
                        Attribute *oc = attr_find( e->e_attrs,
@@ -161,9 +172,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 ) {
@@ -175,28 +186,29 @@ 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 */
-                       rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
+                       op->o_bd = be;
 
-                       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;
+                       if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
+                               rc = entry_schema_check( op, e, NULL, manage,
+                                       &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;
+                               }
                        }
                }
 
                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 +225,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 );
@@ -235,8 +246,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 )
@@ -305,19 +315,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 );
        }