ITS#4780 plug leak

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index e4190eac3b40f5e9809c91e6b2e358d767ad159e..898f0347a1c1e14c37543ec0acaed3040aa3b944 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,37 +44,42 @@ 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 checkvals;
-       char opbuf[OPERATION_BUFFER_SIZE];
-       Operation *op;
+       int lineno, nextline;
+       int lmax;
+       int rc = EXIT_SUCCESS;
+       int manage = 0; 
 
        slap_tool_init( progname, SLAPADD, argc, argv );
 
-       memset( opbuf, 0, sizeof(opbuf) );
-       op = (Operation *)opbuf;
+       memset( &opbuf, 0, sizeof(opbuf) );
+       op = (Operation *) &opbuf;
+       op->o_hdr = (Opheader *)(op+1);
 
        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 );
@@ -89,7 +94,7 @@ slapadd( int argc, char **argv )
        checkvals = (slapMode & SLAP_TOOL_QUICK) ? 0 : 1;
 
        lmax = 0;
-       lineno = 0;
+       nextline = 0;
 
        if( !dryrun && be->be_entry_open( be, 1 ) != 0 ) {
                fprintf( stderr, "%s: could not open database.\n",
@@ -102,8 +107,15 @@ slapadd( int argc, char **argv )
                maxcsn.bv_len = 0;
        }
 
-       while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) {
-               Entry *e = str2entry2( buf, checkvals );
+       /* 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 ) {
+               Entry *e;
+
+               if ( lineno < jumpline )
+                       continue;
+
+               e = str2entry2( buf, checkvals );
 
                /*
                 * Initialize text buffer
@@ -152,8 +164,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 );
 
@@ -167,11 +177,12 @@ slapadd( int argc, char **argv )
                                break;
                        }
 
-                       if( sc == NULL ) {
-                               struct berval val;
+                       /* check schema */
+                       op->o_bd = be;
 
-                               rc = structural_class( oc->a_vals, &val,
-                                       NULL, &text, textbuf, textlen );
+                       if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
+                               rc = entry_schema_check( op, e, NULL, manage, 1,
+                                       &text, textbuf, textlen );
 
                                if( rc != LDAP_SUCCESS ) {
                                        fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
@@ -181,24 +192,6 @@ slapadd( int argc, char **argv )
                                        if( continuemode ) continue;
                                        break;
                                }
-
-                               attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
-                                       &val, NULL );
-                       }
-
-                       /* check schema */
-                       op->o_bd = be;
-
-                       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;
                        }
                }