support increment; don't bother too much about return values of send_search_* functions

[openldap] / servers / slapd / back-ldif / ldif.c

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index 417a4d90d41f3340e7560d08766cc461317dcdb9..c9f3fe1ca9185255ccf4d527f8bca95adebaf4d4 100644 (file)
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -61,8 +61,6 @@ struct ldif_info {
 
 #define ENTRY_BUFF_INCREMENT 500
 
-static ObjectClass *ldif_oc;
-
 static ConfigTable ldifcfg[] = {
        { "directory", "dir", 2, 2, 0, ARG_BERVAL|ARG_OFFSET,
                (void *)offsetof(struct ldif_info, li_base_path),
@@ -79,8 +77,7 @@ static ConfigOCs ldifocs[] = {
                "NAME 'olcLdifConfig' "
                "DESC 'LDIF backend configuration' "
                "SUP olcDatabaseConfig "
-               "MUST ( olcDbDirectory ) )", Cft_Database,
-               &ldif_oc, ldifcfg },
+               "MUST ( olcDbDirectory ) )", Cft_Database, ldifcfg },
        { NULL, 0, NULL }
 };
 
@@ -147,21 +144,18 @@ static char * slurp_file(int fd) {
        return entry;
 }
 
-static int spew_file(int fd, char * spew) {
-       int written = 0;
+static int spew_file(int fd, char * spew, int len) {
        int writeres = 0;
-       int len = strlen(spew);
-       char * spewptr = spew;
        
-       while(written < len) {
-               writeres = write(fd, spewptr, len - written);
+       while(len > 0) {
+               writeres = write(fd, spew, len);
                if(writeres == -1) {
                        perror("could not spew write");
                        return -1;
                }
                else {
-                       spewptr += writeres;
-                       written += writeres;
+                       spew += writeres;
+                       len -= writeres;
                }
        }
        return writeres;
@@ -174,7 +168,7 @@ static int spew_entry(Entry * e, struct berval * path) {
        int entry_length;
        char * entry_as_string;
 
-       openres = open(path->bv_val, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+       openres = open(path->bv_val, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR | S_IWUSR);
        if(openres == -1) {
                if(errno == ENOENT)
                        rs = LDAP_NO_SUCH_OBJECT;
@@ -207,7 +201,7 @@ static int spew_entry(Entry * e, struct berval * path) {
                        close(openres);
                }
                else {
-                       spew_res = spew_file(openres, entry_as_string);
+                       spew_res = spew_file(openres, entry_as_string, entry_length);
                        close(openres);
                        if(spew_res == -1)
                                rs = LDAP_UNWILLING_TO_PERFORM;
@@ -335,18 +329,20 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
                                                ck->op->oq_search.rs_scope == LDAP_SCOPE_ONELEVEL
                                                        ? LDAP_SCOPE_BASE : LDAP_SCOPE_SUBTREE );
 
-                               rc = send_search_reference( ck->op, ck->rs );
-
+                               ck->rs->sr_entry = e;
+                               rc = send_search_reference( ck->op, ck->rs ) < 0;
                                ber_bvarray_free( ck->rs->sr_ref );
                                ber_bvarray_free( erefs );
                                ck->rs->sr_ref = NULL;
+                               ck->rs->sr_entry = NULL;
 
                        } else if ( test_filter( ck->op, e, ck->op->ors_filter ) == LDAP_COMPARE_TRUE )
                        {
                                ck->rs->sr_entry = e;
                                ck->rs->sr_attrs = ck->op->ors_attrs;
                                ck->rs->sr_flags = REP_ENTRY_MODIFIABLE;
-                               rc = send_search_entry(ck->op, ck->rs);
+                               rc = send_search_entry(ck->op, ck->rs) < 0;
+                               ck->rs->sr_entry = NULL;
                        }
                        fd = 1;
                        if ( rc )
@@ -392,7 +388,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
                while(1) {
                        struct berval fname, itmp;
                        struct dirent * dir;
-                       bvlist *bvl, *prev;
+                       bvlist *bvl, **prev;
 
                        dir = readdir(dir_of_path);
                        if(dir == NULL) break; /* end of the directory */
@@ -420,15 +416,14 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
                                }
                        }
 
-                       for (ptr = list, prev = (bvlist *)&list; ptr;
-                               prev = ptr, ptr = ptr->next) {
+                       for (prev = &list; (ptr = *prev) != NULL; prev = &ptr->next) {
                                int cmp = strcmp( bvl->bv.bv_val, ptr->bv.bv_val );
                                if ( !cmp && bvl->num.bv_val )
                                        cmp = bvl->inum - ptr->inum;
                                if ( cmp < 0 )
                                        break;
                        }
-                       prev->next = bvl;
+                       *prev = bvl;
                        bvl->next = ptr;
                                
                }
@@ -471,11 +466,14 @@ enum_tree(
        struct ldif_info *ni = (struct ldif_info *) ck->op->o_bd->be_private;
        struct berval path;
        struct berval pdn, pndn;
+       int rc;
 
        dnParent( &ck->op->o_req_dn, &pdn );
        dnParent( &ck->op->o_req_ndn, &pndn );
        dn2path( &ck->op->o_req_ndn, &ck->op->o_bd->be_nsuffix[0], &ni->li_base_path, &path);
-       return r_enum_tree(ck, &path, &pdn, &pndn);
+       rc = r_enum_tree(ck, &path, &pdn, &pndn);
+       ch_free( path.bv_val );
+       return rc;
 }
 
 /* Get the parent path plus the LDIF suffix */
@@ -522,7 +520,6 @@ static int apply_modify_to_entry(Entry * entry,
                                get_permissiveModify(op),
                                &rs->sr_text, textbuf,
                                sizeof( textbuf ) );
-
                        break;
                                
                case LDAP_MOD_REPLACE:
@@ -530,10 +527,17 @@ static int apply_modify_to_entry(Entry * entry,
                                 get_permissiveModify(op),
                                 &rs->sr_text, textbuf,
                                 sizeof( textbuf ) );
-
                        break;
+
                case LDAP_MOD_INCREMENT:
+                       rc = modify_increment_values( entry,
+                               mods, get_permissiveModify(op),
+                               &rs->sr_text, textbuf,
+                               sizeof( textbuf ) );
+                       break;
+
                        break;
+
                case SLAP_MOD_SOFTADD:
                        mods->sm_op = LDAP_MOD_ADD;
                        rc = modify_add_values(entry, mods,
@@ -556,8 +560,8 @@ static int apply_modify_to_entry(Entry * entry,
                        entry->e_ocflags = 0;
                }
                /* check that the entry still obeys the schema */
-               rc = entry_schema_check(op->o_bd, entry, NULL,
-                                 &rs->sr_text, textbuf, sizeof( textbuf ) );
+               rc = entry_schema_check(op->o_bd, entry, NULL, 0,
+                         &rs->sr_text, textbuf, sizeof( textbuf ) );
        }
        return rc;
 }
@@ -763,8 +767,8 @@ static int ldif_back_add(Operation *op, SlapReply *rs) {
        int statres;
        char textbuf[SLAP_TEXT_BUFLEN];
 
-       rs->sr_err = entry_schema_check(op->o_bd, e,
-                                 NULL, &rs->sr_text, textbuf, sizeof( textbuf ) );
+       rs->sr_err = entry_schema_check(op->o_bd, e, NULL, 0,
+               &rs->sr_text, textbuf, sizeof( textbuf ) );
        if ( rs->sr_err != LDAP_SUCCESS ) goto send_res;
                                
        ldap_pvt_thread_mutex_lock(&ni->li_mutex);
@@ -1166,6 +1170,8 @@ ldif_back_db_destroy(
                           )
 {
        struct ldif_info *ni = be->be_private;
+
+       ch_free(ni->li_base_path.bv_val);
        ldap_pvt_thread_mutex_destroy(&ni->li_mutex);
        free( be->be_private );
        return 0;
@@ -1196,6 +1202,7 @@ ldif_back_initialize(
        int rc;
 
        bi->bi_flags |=
+               SLAP_BFLAG_INCREMENT |
                SLAP_BFLAG_REFERRALS;
 
        bi->bi_controls = controls;
@@ -1241,6 +1248,8 @@ ldif_back_initialize(
        bi->bi_tool_id2entry_get = 0;
        bi->bi_tool_entry_modify = 0;
 
+       bi->bi_cf_ocs = ldifocs;
+
        rc = config_register_schema( ldifcfg, ldifocs );
        if ( rc ) return rc;
        return 0;