#include "lutil.h"
#include "config.h"
+typedef struct enumCookie {
+ Operation *op;
+ SlapReply *rs;
+ Entry **entries;
+ int elen;
+ int eind;
+} enumCookie;
+
struct ldif_info {
struct berval li_base_path;
- ID tool_current;
- Entry ** tool_entries;
- int tool_put_entry_flag;
- int tool_numentries;
+ enumCookie li_tool_cookie;
+ ID li_tool_current;
ldap_pvt_thread_mutex_t li_mutex;
};
-#define LDIF ".ldif"
+#ifdef _WIN32
+#define mkdir(a,b) mkdir(a)
+#endif
-#define ENTRY_BUFF_INCREMENT 500
+#define LDIF ".ldif"
-static ObjectClass *ldif_oc;
+#define IX_DNL '{'
+#define IX_DNR '}'
+#ifndef IX_FSL
+#define IX_FSL IX_DNL
+#define IX_FSR IX_DNR
+#endif
-static ConfigDriver ldif_cf;
+#define ENTRY_BUFF_INCREMENT 500
static ConfigTable ldifcfg[] = {
- { "", "", 0, 0, 0, ARG_MAGIC,
- ldif_cf, NULL, NULL, NULL },
{ "directory", "dir", 2, 2, 0, ARG_BERVAL|ARG_OFFSET,
(void *)offsetof(struct ldif_info, li_base_path),
- "( OLcfgAt:1.1 NAME 'dbDirectory' "
+ "( OLcfgDbAt:0.1 NAME 'olcDbDirectory' "
"DESC 'Directory for database content' "
"EQUALITY caseIgnoreMatch "
"SYNTAX OMsDirectoryString )", NULL, NULL },
};
static ConfigOCs ldifocs[] = {
- { "( OLcfgOc:2.1 "
- "NAME 'ldifConfig' "
+ { "( OLcfgDbOc:2.1 "
+ "NAME 'olcLdifConfig' "
"DESC 'LDIF backend configuration' "
- "AUXILIARY "
- "MAY ( dbDirectory ) )",
- &ldif_oc },
- { NULL, NULL }
+ "SUP olcDatabaseConfig "
+ "MUST ( olcDbDirectory ) )", Cft_Database, ldifcfg },
+ { NULL, 0, NULL }
};
-static int
-ldif_cf( ConfigArgs *c )
+static void
+dn2path(struct berval * dn, struct berval * rootdn, struct berval * base_path,
+ struct berval *res)
{
- if ( c->op == SLAP_CONFIG_EMIT ) {
- value_add_one( &c->rvalue_vals, &ldif_oc->soc_cname );
- return 0;
- }
- return 1;
-}
-
-static char *
-dn2path(struct berval * dn, struct berval * rootdn, struct berval * base_path)
-{
- char *result = ch_malloc( dn->bv_len + base_path->bv_len + 2 +
- STRLENOF( LDIF ));
char *ptr, *sep, *end;
- ptr = lutil_strcopy( result, base_path->bv_val );
+ res->bv_len = dn->bv_len + base_path->bv_len + 1 + STRLENOF( LDIF );
+ res->bv_val = ch_malloc( res->bv_len + 1 );
+ ptr = lutil_strcopy( res->bv_val, base_path->bv_val );
*ptr++ = LDAP_DIRSEP[0];
ptr = lutil_strcopy( ptr, rootdn->bv_val );
end = dn->bv_val + dn->bv_len - rootdn->bv_len - 1;
end = sep;
}
strcpy(ptr, LDIF);
- return result;
+#if IX_FSL != IX_DNL
+ ptr = res->bv_val;
+ while( ptr=strchr(ptr, IX_DNL) ) {
+ *ptr++ = IX_FSL;
+ ptr = strchr(ptr, IX_DNR);
+ if ( ptr )
+ *ptr++ = IX_FSR;
+ else
+ break;
+ }
+#endif
}
-static char * slurp_file(int fd) {
- int entry_buf_size = 40 * ENTRY_BUFF_INCREMENT;
+static char * slurp_file(int fd) {
int read_chars_total = 0;
int read_chars = 0;
- int entry_size = 40 * ENTRY_BUFF_INCREMENT;
- char * entry = (char *) malloc(sizeof(char) * 40 * ENTRY_BUFF_INCREMENT);
- char * entry_pos = entry;
+ int entry_size;
+ char * entry;
+ char * entry_pos;
+ struct stat st;
+
+ fstat(fd, &st);
+ entry_size = st.st_size;
+ entry = ch_malloc( entry_size+1 );
+ entry_pos = entry;
while(1) {
- if(entry_size - read_chars_total == 0) {
- entry = (char *) realloc(entry, sizeof(char) * 2 * entry_size);
- entry_size = 2 * entry_size;
- }
- read_chars = read(fd, (void *) entry_pos, entry_size - read_chars_total);
- if(read_chars == -1) {
- SLAP_FREE(entry);
- return NULL;
- }
- entry_pos += read_chars;
- if(read_chars == 0) {
- if(entry_size - read_chars_total > 0)
- entry[read_chars_total] = '\0';
- else {
- entry = (char *) realloc(entry, sizeof(char) * entry_size + 1);
- entry_size = entry_size + 1;
- entry[read_chars_total] = '\0';
- }
- break;
- }
- else {
- read_chars_total += read_chars;
- }
+ read_chars = read(fd, (void *) entry_pos, entry_size - read_chars_total);
+ if(read_chars == -1) {
+ SLAP_FREE(entry);
+ return NULL;
+ }
+ if(read_chars == 0) {
+ entry[read_chars_total] = '\0';
+ break;
+ }
+ else {
+ read_chars_total += read_chars;
+ entry_pos += read_chars;
+ }
}
return entry;
}
-static int spew_file(int fd, char * spew) {
- int written = 0;
- int writeres;
- int len = strlen(spew);
- char * spewptr = spew;
+static int spew_file(int fd, char * spew, int len) {
+ int writeres = 0;
- while(written < len) {
- writeres = write(fd, spewptr, len - written);
- if(writeres == -1) {
- perror("could not spew write");
- return -1;
- }
- else {
- spewptr += writeres;
- written += writeres;
- }
+ while(len > 0) {
+ writeres = write(fd, spew, len);
+ if(writeres == -1) {
+ perror("could not spew write");
+ return -1;
+ }
+ else {
+ spew += writeres;
+ len -= writeres;
+ }
}
return writeres;
}
-static int spew_entry(Entry * e, char * path) {
+static int spew_entry(Entry * e, struct berval * path) {
int rs;
int openres;
int spew_res;
int entry_length;
char * entry_as_string;
- openres = open(path, 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;
- else
- rs = LDAP_UNWILLING_TO_PERFORM;
+ if(errno == ENOENT)
+ rs = LDAP_NO_SUCH_OBJECT;
+ else
+ rs = LDAP_UNWILLING_TO_PERFORM;
}
else {
- entry_as_string = entry2str(e, &entry_length);
- if(entry_as_string == NULL) {
- rs = LDAP_UNWILLING_TO_PERFORM;
- close(openres);
- }
- else {
- spew_res = spew_file(openres, entry_as_string);
- close(openres);
- if(spew_res == -1)
- rs = LDAP_UNWILLING_TO_PERFORM;
- else
- rs = LDAP_SUCCESS;
- }
- }
+ struct berval rdn;
+ int tmp;
+
+ /* Only save the RDN onto disk */
+ dnRdn( &e->e_name, &rdn );
+ if ( rdn.bv_len != e->e_name.bv_len ) {
+ e->e_name.bv_val[rdn.bv_len] = '\0';
+ tmp = e->e_name.bv_len;
+ e->e_name.bv_len = rdn.bv_len;
+ rdn.bv_len = tmp;
+ }
+
+ entry_as_string = entry2str(e, &entry_length);
+
+ /* Restore full DN */
+ if ( rdn.bv_len != e->e_name.bv_len ) {
+ e->e_name.bv_val[e->e_name.bv_len] = ',';
+ e->e_name.bv_len = rdn.bv_len;
+ }
+
+ if(entry_as_string == NULL) {
+ rs = LDAP_UNWILLING_TO_PERFORM;
+ close(openres);
+ }
+ else {
+ spew_res = spew_file(openres, entry_as_string, entry_length);
+ close(openres);
+ if(spew_res == -1)
+ rs = LDAP_UNWILLING_TO_PERFORM;
+ else
+ rs = LDAP_SUCCESS;
+ }
+ }
return rs;
}
-static Entry * get_entry_for_fd(int fd) {
+static Entry * get_entry_for_fd(int fd,
+ struct berval *pdn,
+ struct berval *pndn)
+{
char * entry = (char *) slurp_file(fd);
Entry * ldentry = NULL;
/* error reading file */
if(entry == NULL) {
- goto return_value;
+ goto return_value;
}
ldentry = str2entry(entry);
+ if ( ldentry ) {
+ struct berval rdn;
+ rdn = ldentry->e_name;
+ build_new_dn( &ldentry->e_name, pdn, &rdn, NULL );
+ ch_free( rdn.bv_val );
+ rdn = ldentry->e_nname;
+ build_new_dn( &ldentry->e_nname, pndn, &rdn, NULL );
+ ch_free( rdn.bv_val );
+ }
return_value:
if(fd != -1) {
- if(close(fd) != 0) {
- /* log error */
- }
+ if(close(fd) != 0) {
+ /* log error */
+ }
}
if(entry != NULL)
- SLAP_FREE(entry);
+ SLAP_FREE(entry);
return ldentry;
}
-static Entry * get_entry(struct berval * dn, struct berval * rootdn, struct berval * base_path) {
- char * path = (char *) dn2path(dn, rootdn, base_path);
- int fd = open(path, O_RDONLY);
+static Entry * get_entry(Operation *op, struct berval *base_path) {
+ struct berval path, pdn, pndn;
+ int fd;
+ dnParent(&op->o_req_dn, &pdn);
+ dnParent(&op->o_req_ndn, &pndn);
+ dn2path(&op->o_req_ndn, op->o_bd->be_nsuffix, base_path, &path);
+ fd = open(path.bv_val, O_RDONLY);
/* error opening file (mebbe should log error) */
if(fd == -1) {
- perror("failed to open file");
- goto return_value;
+ perror("failed to open file");
}
- goto return_value;
- return_value:
- if(path != NULL)
- SLAP_FREE(path);
- return get_entry_for_fd(fd);
+ if(path.bv_val != NULL)
+ SLAP_FREE(path.bv_val);
+
+ if ( fd != -1 ) {
+ return get_entry_for_fd(fd, &pdn, &pndn);
+ }
+
+ return NULL;
}
-/* takes a base path and a filename and opens that file */
-static int fd_for_path_components(char * base, char * name) {
- char * absolutepath;
- int fd;
- absolutepath = (char *) SLAP_MALLOC(sizeof(char) *
- (strlen(base) +
- strlen(name) + 2));
- absolutepath[0] = '\0';
- strcat(absolutepath, base);
- strcat(absolutepath, LDAP_DIRSEP);
- strcat(absolutepath, name);
- fd = open(absolutepath, O_RDONLY);
- SLAP_FREE(absolutepath);
- return fd;
+static void fullpath(struct berval *base, struct berval *name, struct berval *res) {
+ char *ptr;
+ res->bv_len = name->bv_len + base->bv_len + 1;
+ res->bv_val = ch_malloc( res->bv_len + 1 );
+ strcpy(res->bv_val, base->bv_val);
+ ptr = res->bv_val + base->bv_len;
+ *ptr++ = LDAP_DIRSEP[0];
+ strcpy(ptr, name->bv_val);
}
-static Entry ** r_enum_tree(Entry ** entries, int *elen, int *eind, char * path) {
- DIR * dir_of_path = opendir(path);
- int fd;
- struct dirent * dir;
- char * newpath;
- Entry * e;
+typedef struct bvlist {
+ struct bvlist *next;
+ struct berval bv;
+ struct berval num;
+ unsigned int inum;
+ int off;
+} bvlist;
+
- if(entries == NULL) {
- entries = (Entry **) SLAP_MALLOC(sizeof(Entry *) * ENTRY_BUFF_INCREMENT);
- *elen = ENTRY_BUFF_INCREMENT;
+static int r_enum_tree(enumCookie *ck, struct berval *path,
+ struct berval *pdn, struct berval *pndn)
+{
+ Entry *e;
+ int fd, rc = LDAP_SUCCESS;
+
+ fd = open( path->bv_val, O_RDONLY );
+ if ( fd < 0 ) {
+ Debug( LDAP_DEBUG_TRACE,
+ "=> ldif_enum_tree: failed to open %s\n",
+ path->bv_val, 0, 0 );
+ return LDAP_NO_SUCH_OBJECT;
}
- if(dir_of_path == NULL) {/* can't open directory */
- perror("failed to open directory");
- return entries;
+
+ e = get_entry_for_fd(fd, pdn, pndn);
+ if ( !e ) {
+ Debug( LDAP_DEBUG_ANY,
+ "=> ldif_enum_tree: failed to read entry for %s\n",
+ path->bv_val, 0, 0 );
+ return LDAP_BUSY;
}
+
+ if ( ck->op->ors_scope == LDAP_SCOPE_BASE ||
+ ck->op->ors_scope == LDAP_SCOPE_SUBTREE ) {
+ /* Send right away? */
+ if ( ck->rs ) {
+ /*
+ * if it's a referral, add it to the list of referrals. only do
+ * this for non-base searches, and don't check the filter
+ * explicitly here since it's only a candidate anyway.
+ */
+ if ( !get_manageDSAit( ck->op )
+ && ck->op->ors_scope != LDAP_SCOPE_BASE
+ && is_entry_referral( e ) )
+ {
+ BerVarray erefs = get_entry_referrals( ck->op, e );
+ ck->rs->sr_ref = referral_rewrite( erefs,
+ &e->e_name, NULL,
+ ck->op->oq_search.rs_scope == LDAP_SCOPE_ONELEVEL
+ ? LDAP_SCOPE_BASE : LDAP_SCOPE_SUBTREE );
+
+ 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) < 0;
+ ck->rs->sr_entry = NULL;
+ }
+ fd = 1;
+ if ( rc )
+ goto leave;
+ } else {
+ /* Queueing up for tool mode */
+ if(ck->entries == NULL) {
+ ck->entries = (Entry **) SLAP_MALLOC(sizeof(Entry *) * ENTRY_BUFF_INCREMENT);
+ ck->elen = ENTRY_BUFF_INCREMENT;
+ }
+ if(ck->eind >= ck->elen) { /* grow entries if necessary */
+ ck->entries = (Entry **) SLAP_REALLOC(ck->entries, sizeof(Entry *) * (ck->elen) * 2);
+ ck->elen *= 2;
+ }
+
+ ck->entries[ck->eind++] = e;
+ fd = 0;
+ }
+ } else {
+ fd = 1;
+ }
+
+ if ( ck->op->ors_scope != LDAP_SCOPE_BASE ) {
+ DIR * dir_of_path;
+ bvlist *list = NULL, *ptr;
+
+ path->bv_len -= STRLENOF( LDIF );
+ path->bv_val[path->bv_len] = '\0';
+
+ dir_of_path = opendir(path->bv_val);
+ if(dir_of_path == NULL) { /* can't open directory */
+ if ( errno != ENOENT ) {
+ /* it shouldn't be treated as an error
+ * only if the directory doesn't exist */
+ rc = LDAP_BUSY;
+ Debug( LDAP_DEBUG_TRACE,
+ "=> ldif_enum_tree: failed to opendir %s (%d)\n",
+ path->bv_val, errno, 0 );
+ }
+ goto leave;
+ }
- while(1) {
- dir = readdir(dir_of_path);
- if(dir == NULL) break; /* end of the directory */
- if(dir->d_type == DT_REG) { /* regular file, read the entry into memory */
- if(! (*eind < *elen)) { /* grow entries if necessary */
- entries = (Entry **) SLAP_REALLOC(entries, sizeof(Entry *) * (*elen) * 2);
- *elen = *elen * 2;
- }
- fd = fd_for_path_components(path, dir->d_name);
- if(fd != -1) {
- e = get_entry_for_fd(fd);
- if(e != NULL) {
- entries[*eind] = e;
- *eind = *eind + 1;
+ while(1) {
+ struct berval fname, itmp;
+ struct dirent * dir;
+ bvlist *bvl, **prev;
+
+ dir = readdir(dir_of_path);
+ if(dir == NULL) break; /* end of the directory */
+ fname.bv_len = strlen( dir->d_name );
+ if ( fname.bv_len <= STRLENOF( LDIF ))
+ continue;
+ if ( strcmp( dir->d_name + (fname.bv_len - STRLENOF(LDIF)), LDIF))
+ continue;
+ fname.bv_val = dir->d_name;
+
+ bvl = ch_malloc( sizeof(bvlist) );
+ ber_dupbv( &bvl->bv, &fname );
+ BER_BVZERO( &bvl->num );
+ itmp.bv_val = strchr( bvl->bv.bv_val, IX_FSL );
+ if ( itmp.bv_val ) {
+ char *ptr;
+ itmp.bv_val++;
+ ptr = strchr( itmp.bv_val, IX_FSR );
+ if ( ptr ) {
+ itmp.bv_len = ptr - itmp.bv_val;
+ ber_dupbv( &bvl->num, &itmp );
+ bvl->inum = strtoul( itmp.bv_val, NULL, 0 );
+ itmp.bv_val[0] = '\0';
+ bvl->off = itmp.bv_val - bvl->bv.bv_val;
+ }
+ }
+
+ 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 = bvl;
+ bvl->next = ptr;
+
+ }
+ closedir(dir_of_path);
+
+ if (ck->op->ors_scope == LDAP_SCOPE_ONELEVEL)
+ ck->op->ors_scope = LDAP_SCOPE_BASE;
+ else if ( ck->op->ors_scope == LDAP_SCOPE_SUBORDINATE)
+ ck->op->ors_scope = LDAP_SCOPE_SUBTREE;
+
+ while ( ( ptr = list ) ) {
+ struct berval fpath;
+
+ list = ptr->next;
+
+ if ( rc == LDAP_SUCCESS ) {
+ if ( ptr->num.bv_val )
+ AC_MEMCPY( ptr->bv.bv_val + ptr->off, ptr->num.bv_val,
+ ptr->num.bv_len );
+ fullpath( path, &ptr->bv, &fpath );
+ rc = r_enum_tree(ck, &fpath, &e->e_name, &e->e_nname );
+ free(fpath.bv_val);
+ }
+ if ( ptr->num.bv_val )
+ free( ptr->num.bv_val );
+ free(ptr->bv.bv_val);
+ free(ptr);
+ }
}
- else
- perror("failed to read entry");
- }
- else
- perror("failed to open fd");
- }
- else if(dir->d_type == DT_DIR) {
- if(! (strcasecmp(dir->d_name, ".") == 0 || strcasecmp(dir->d_name, "..") == 0)) {
- newpath = (char *) SLAP_MALLOC(sizeof(char) *
- (strlen(path) + strlen(dir->d_name) + 2));
- newpath[0] = '\0';
- strcat(newpath, path);
- strcat(newpath, LDAP_DIRSEP);
- strcat(newpath, dir->d_name);
- entries = r_enum_tree(entries, elen, eind, newpath);
- SLAP_FREE(newpath);
- }
- }
- }
- closedir(dir_of_path);
- return entries;
+leave:
+ if ( fd ) entry_free( e );
+ return rc;
}
-static Entry ** enum_tree(struct berval * path, int * length) {
- int index = 0;
- return r_enum_tree(NULL, &index, length, path->bv_val);
+static int
+enum_tree(
+ enumCookie *ck
+)
+{
+ 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);
+ rc = r_enum_tree(ck, &path, &pdn, &pndn);
+ ch_free( path.bv_val );
+ return rc;
}
-static char * get_parent_path(char * dnpath) {
- int dnpathlen = strlen(dnpath);
- char * result;
+/* Get the parent path plus the LDIF suffix */
+static void get_parent_path(struct berval * dnpath, struct berval *res) {
+ int dnpathlen = dnpath->bv_len;
int i;
for(i = dnpathlen;i>0;i--) /* find the first path seperator */
- if(dnpath[i] == LDAP_DIRSEP[0])
- break;
- result = ch_malloc( i + 1 );
- strncpy(result, dnpath, i);
- result[i] = '\0';
- return result;
+ if(dnpath->bv_val[i] == LDAP_DIRSEP[0])
+ break;
+ res->bv_len = i;
+ res->bv_val = ch_malloc( res->bv_len + 1 + STRLENOF(LDIF) );
+ strncpy(res->bv_val, dnpath->bv_val, i);
+ strcpy(res->bv_val+i, LDIF);
+ res->bv_val[i] = '\0';
}
-static int apply_modify_to_entry(Entry * entry,
- Modifications * modlist,
- Operation * op,
- SlapReply * rs)
+static int apply_modify_to_entry(Entry * entry,
+ Modifications * modlist,
+ Operation * op,
+ SlapReply * rs)
{
char textbuf[SLAP_TEXT_BUFLEN];
- size_t textlen = sizeof textbuf;
- int rc;
- int tempdebug;
+ int rc = LDAP_UNWILLING_TO_PERFORM;
Modification *mods = NULL;
- Attribute *save_attrs;
if (!acl_check_modlist(op, entry, modlist)) {
- return LDAP_INSUFFICIENT_ACCESS;
+ return LDAP_INSUFFICIENT_ACCESS;
}
- /* save_attrs = entry->e_attrs; Why?
- entry->e_attrs = attrs_dup(entry->e_attrs); */
-
for (; modlist != NULL; modlist = modlist->sml_next) {
- mods = &modlist->sml_mod;
-
- switch (mods->sm_op) {
- case LDAP_MOD_ADD:
- rc = modify_add_values(entry, mods,
- get_permissiveModify(op),
- &rs->sr_text, textbuf,
- textlen);
- break;
+ mods = &modlist->sml_mod;
+
+ switch (mods->sm_op) {
+ case LDAP_MOD_ADD:
+ rc = modify_add_values(entry, mods,
+ get_permissiveModify(op),
+ &rs->sr_text, textbuf,
+ sizeof( textbuf ) );
+ break;
- case LDAP_MOD_DELETE:
- rc = modify_delete_values(entry, mods,
- get_permissiveModify(op),
- &rs->sr_text, textbuf,
- textlen);
-
- break;
+ case LDAP_MOD_DELETE:
+ rc = modify_delete_values(entry, mods,
+ get_permissiveModify(op),
+ &rs->sr_text, textbuf,
+ sizeof( textbuf ) );
+ break;
- case LDAP_MOD_REPLACE:
- rc = modify_replace_values(entry, mods,
- get_permissiveModify(op),
- &rs->sr_text, textbuf,
- textlen);
-
- break;
- case LDAP_MOD_INCREMENT:
- break;
- case SLAP_MOD_SOFTADD:
- mods->sm_op = LDAP_MOD_ADD;
- rc = modify_add_values(entry, mods,
- get_permissiveModify(op),
- &rs->sr_text, textbuf,
- textlen);
- mods->sm_op = SLAP_MOD_SOFTADD;
- if (rc == LDAP_TYPE_OR_VALUE_EXISTS) {
- rc = LDAP_SUCCESS;
- }
- break;
- default:
- break;
- }
- if(rc != LDAP_SUCCESS) break;
+ case LDAP_MOD_REPLACE:
+ rc = modify_replace_values(entry, mods,
+ 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,
+ get_permissiveModify(op),
+ &rs->sr_text, textbuf,
+ sizeof( textbuf ) );
+ mods->sm_op = SLAP_MOD_SOFTADD;
+ if (rc == LDAP_TYPE_OR_VALUE_EXISTS) {
+ rc = LDAP_SUCCESS;
+ }
+ break;
+ default:
+ break;
+ }
+ if(rc != LDAP_SUCCESS) break;
}
if(rc == LDAP_SUCCESS) {
- if ( mods->sm_desc == slap_schema.si_ad_objectClass ) {
- entry->e_ocflags = 0;
- }
- /* check that the entry still obeys the schema */
- rc = entry_schema_check(op->o_bd, entry,
- save_attrs, &rs->sr_text,
- textbuf, textlen);
+ if ( mods->sm_desc == slap_schema.si_ad_objectClass ) {
+ entry->e_ocflags = 0;
+ }
+ /* check that the entry still obeys the schema */
+ rc = entry_schema_check(op->o_bd, entry, NULL, 0,
+ &rs->sr_text, textbuf, sizeof( textbuf ) );
+ }
+ return rc;
+}
+
+int
+ldif_back_referrals( Operation *op, SlapReply *rs )
+{
+ struct ldif_info *ni = NULL;
+ Entry *entry;
+ int rc = LDAP_SUCCESS;
+
+#if 0
+ if ( op->o_tag == LDAP_REQ_SEARCH ) {
+ /* let search take care of itself */
+ return rc;
+ }
+#endif
+
+ if ( get_manageDSAit( op ) ) {
+ /* let op take care of DSA management */
+ return rc;
+ }
+
+ ni = (struct ldif_info *)op->o_bd->be_private;
+ ldap_pvt_thread_mutex_lock( &ni->li_mutex );
+ entry = (Entry *)get_entry( op, &ni->li_base_path );
+
+ /* no object is found for them */
+ if ( entry == NULL ) {
+ struct berval odn = op->o_req_dn;
+ struct berval ondn = op->o_req_ndn;
+
+ struct berval pndn = op->o_req_ndn;
+
+ for ( ; entry == NULL; ) {
+ dnParent( &pndn, &pndn );
+
+ if ( !dnIsSuffix( &pndn, &op->o_bd->be_nsuffix[0] ) ) {
+ break;
+ }
+
+ op->o_req_dn = pndn;
+ op->o_req_ndn = pndn;
+
+ entry = (Entry *)get_entry( op, &ni->li_base_path );
+ }
+
+ ldap_pvt_thread_mutex_unlock( &ni->li_mutex );
+
+ op->o_req_dn = odn;
+ op->o_req_ndn = ondn;
+
+ rc = LDAP_SUCCESS;
+ rs->sr_matched = NULL;
+ if ( entry != NULL ) {
+ Debug( LDAP_DEBUG_TRACE,
+ "ldif_back_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
+ (long) op->o_tag, op->o_req_dn.bv_val, entry->e_name.bv_val );
+
+ if ( is_entry_referral( entry ) ) {
+ rc = LDAP_OTHER;
+ rs->sr_ref = get_entry_referrals( op, entry );
+ if ( rs->sr_ref ) {
+ rs->sr_matched = ber_strdup_x(
+ entry->e_name.bv_val, op->o_tmpmemctx );
+ }
+ }
+
+ entry_free(entry);
+
+ } else if ( default_referral != NULL ) {
+ rc = LDAP_OTHER;
+ rs->sr_ref = referral_rewrite( default_referral,
+ NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
+ }
+
+ if ( rs->sr_ref != NULL ) {
+ /* send referrals */
+ rc = rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
+ ber_bvarray_free( rs->sr_ref );
+ rs->sr_ref = NULL;
+
+ } else if ( rc != LDAP_SUCCESS ) {
+ rs->sr_err = rc;
+ rs->sr_text = rs->sr_matched ? "bad referral object" : NULL;
+ send_ldap_result( op, rs );
+ }
+
+ if ( rs->sr_matched ) {
+ op->o_tmpfree( (char *)rs->sr_matched, op->o_tmpmemctx );
+ rs->sr_matched = NULL;
+ }
+
+ return rc;
+ }
+
+ ldap_pvt_thread_mutex_unlock( &ni->li_mutex );
+
+ if ( is_entry_referral( entry ) ) {
+ /* entry is a referral */
+ BerVarray refs = get_entry_referrals( op, entry );
+ rs->sr_ref = referral_rewrite(
+ refs, &entry->e_name, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
+
+ Debug( LDAP_DEBUG_TRACE,
+ "ldif_back_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
+ (long) op->o_tag, op->o_req_dn.bv_val, entry->e_name.bv_val );
+
+ rs->sr_matched = entry->e_name.bv_val;
+ if ( rs->sr_ref != NULL ) {
+ rc = rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
+ ber_bvarray_free( rs->sr_ref );
+ rs->sr_ref = NULL;
+
+ } else {
+ send_ldap_error( op, rs, LDAP_OTHER, "bad referral object" );
+ rc = rs->sr_err;
+ }
+
+ rs->sr_matched = NULL;
+ ber_bvarray_free( refs );
+
+ entry_free( entry );
}
+
return rc;
}
ni = (struct ldif_info *) op->o_bd->be_private;
ldap_pvt_thread_mutex_lock(&ni->li_mutex);
- entry = (Entry *) get_entry(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path);
+ entry = (Entry *) get_entry(op, &ni->li_base_path);
/* no object is found for them */
if(entry == NULL) {
- if(be_isroot_pw(op)) {
- return_val = LDAP_SUCCESS;
- goto return_result;
- }
- else if(be_root_dn(op->o_bd)) {
- return_val = LDAP_INVALID_CREDENTIALS;
- rs->sr_err = LDAP_INVALID_CREDENTIALS;
- goto return_result;
- }
- else {
- rs->sr_err = LDAP_NO_SUCH_OBJECT;
- return_val = 1;
- goto return_result;
- }
+ if(be_isroot_pw(op)) {
+ rs->sr_err = return_val = LDAP_SUCCESS;
+ } else {
+ rs->sr_err = return_val = LDAP_INVALID_CREDENTIALS;
+ }
+ goto return_result;
}
/* they don't have userpassword */
if((a = attr_find(entry->e_attrs, password)) == NULL) {
- rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
- return_val = 1;
- goto return_result;
+ rs->sr_err = LDAP_INAPPROPRIATE_AUTH;
+ return_val = 1;
+ goto return_result;
}
/* authentication actually failed */
if(slap_passwd_check(op, entry, a, &op->oq_bind.rb_cred,
- &rs->sr_text) != 0) {
- rs->sr_err = LDAP_INVALID_CREDENTIALS;
- return_val = 1;
- goto return_result;
+ &rs->sr_text) != 0) {
+ rs->sr_err = LDAP_INVALID_CREDENTIALS;
+ return_val = 1;
+ goto return_result;
}
/* let the front-end send success */
return_result:
ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
if(return_val != 0)
- send_ldap_result( op, rs );
+ send_ldap_result( op, rs );
if(entry != NULL)
- entry_free(entry);
+ entry_free(entry);
return return_val;
}
static int ldif_back_search(Operation *op, SlapReply *rs)
{
struct ldif_info *ni = (struct ldif_info *) op->o_bd->be_private;
- int numentries = 0;
- int i = 0;
- Entry ** entries = NULL;
+ enumCookie ck = {0};
+ ck.op = op;
+ ck.rs = rs;
ldap_pvt_thread_mutex_lock(&ni->li_mutex);
- entries = (Entry **) enum_tree(&ni->li_base_path, &numentries);
-
- if(entries != NULL) {
- for(i=0;i<numentries;i++) {
- if(test_filter(op, entries[i], op->ors_filter) == LDAP_COMPARE_TRUE) {
- rs->sr_entry = entries[i];
- rs->sr_attrs = op->ors_attrs;
- rs->sr_flags = REP_ENTRY_MODIFIABLE;
- send_search_entry(op, rs);
- }
- entry_free(entries[i]);
- }
- SLAP_FREE(entries);
- rs->sr_err = LDAP_SUCCESS;
- ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
- send_ldap_result(op, rs);
- }
- else {
- rs->sr_err = LDAP_BUSY;
- ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
- send_ldap_result(op, rs);
- }
+ rs->sr_err = enum_tree( &ck );
+ ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
+ send_ldap_result(op, rs);
- return 0;
+ return rs->sr_err;
}
static int ldif_back_add(Operation *op, SlapReply *rs) {
struct ldif_info *ni = (struct ldif_info *) op->o_bd->be_private;
Entry * e = op->ora_e;
- Attribute *save_attrs;
struct berval dn = e->e_nname;
- char * leaf_path = NULL;
- char * base = NULL;
- char * base_ldif = NULL;
+ struct berval leaf_path = BER_BVNULL;
struct stat stats;
int statres;
char textbuf[SLAP_TEXT_BUFLEN];
- size_t textlen = 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);
- ldap_pvt_thread_mutex_lock(&entry2str_mutex);
- leaf_path = (char *) dn2path(&dn, &op->o_bd->be_nsuffix[0], &ni->li_base_path);
-
- /* save_attrs = e->e_attrs; why?
- e->e_attrs = attrs_dup(e->e_attrs);*/
-
- if(leaf_path != NULL) {
- char * tmp;
- /* build path to container, and path to ldif of container */
- base = (char *) get_parent_path(leaf_path);
- base_ldif = (char *) SLAP_MALLOC(sizeof(char) * (strlen(base) + 6));
- tmp = (char *) lutil_strcopy(base_ldif, base);
- lutil_strcopy(tmp, LDIF);
-
- rs->sr_err = entry_schema_check(op->o_bd, e,
- save_attrs,
- &rs->sr_text,
- textbuf, textlen);
- if(rs->sr_err == LDAP_SUCCESS) {
- statres = stat(base, &stats); /* check if container exists */
- if(statres == -1 && errno == ENOENT) { /* container missing */
- statres = stat(base_ldif, &stats); /* check for leaf node */
- if(statres == -1 && errno == ENOENT) {
- rs->sr_err = LDAP_NO_SUCH_OBJECT; /* parent doesn't exist */
- }
- else if(statres != -1) { /* create parent */
- int mkdirres = mkdir(base, 0750);
- if(mkdirres == -1) {
- rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
- }
+ dn2path(&dn, &op->o_bd->be_nsuffix[0], &ni->li_base_path, &leaf_path);
+
+ if(leaf_path.bv_val != NULL) {
+ struct berval base = BER_BVNULL;
+ /* build path to container and ldif of container */
+ get_parent_path(&leaf_path, &base);
+
+ statres = stat(base.bv_val, &stats); /* check if container exists */
+ if(statres == -1 && errno == ENOENT) { /* container missing */
+ base.bv_val[base.bv_len] = '.';
+ statres = stat(base.bv_val, &stats); /* check for leaf node */
+ base.bv_val[base.bv_len] = '\0';
+ if(statres == -1 && errno == ENOENT) {
+ rs->sr_err = LDAP_NO_SUCH_OBJECT; /* parent doesn't exist */
+ }
+ else if(statres != -1) { /* create parent */
+ int mkdirres = mkdir(base.bv_val, 0750);
+ if(mkdirres == -1) {
+ rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+ }
+ }
+ else
+ rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+ }/* container was possibly created, move on to add the entry */
+ if(rs->sr_err == LDAP_SUCCESS) {
+ statres = stat(leaf_path.bv_val, &stats);
+ if(statres == -1 && errno == ENOENT) {
+ ldap_pvt_thread_mutex_lock(&entry2str_mutex);
+ rs->sr_err = (int) spew_entry(e, &leaf_path);
+ ldap_pvt_thread_mutex_unlock(&entry2str_mutex);
+ }
+ else /* it already exists */
+ rs->sr_err = LDAP_ALREADY_EXISTS;
+ }
+ SLAP_FREE(base.bv_val);
+ SLAP_FREE(leaf_path.bv_val);
}
- else
- rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
- }/* container was possibly created, move on to add the entry */
- if(rs->sr_err == LDAP_SUCCESS) {
- statres = stat(leaf_path, &stats);
- if(statres == -1 && errno == ENOENT) {
- rs->sr_err = (int) spew_entry(e, leaf_path);
- }
- else /* it already exists */
- rs->sr_err = LDAP_ALREADY_EXISTS;
- }
- }
- }
ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
- ldap_pvt_thread_mutex_unlock(&entry2str_mutex);
- send_ldap_result(op, rs);
- if(leaf_path != NULL)
- SLAP_FREE(leaf_path);
- if(base != NULL)
- SLAP_FREE(base);
- if(base_ldif != NULL)
- SLAP_FREE(base_ldif);
+send_res:
+ send_ldap_result(op, rs);
return 0;
}
static int ldif_back_modify(Operation *op, SlapReply *rs) {
struct ldif_info *ni = (struct ldif_info *) op->o_bd->be_private;
Modifications * modlst = op->orm_modlist;
- char * path = NULL;
+ struct berval path = BER_BVNULL;
Entry * entry = NULL;
int spew_res;
ldap_pvt_thread_mutex_lock(&ni->li_mutex);
- ldap_pvt_thread_mutex_lock(&entry2str_mutex);
- path = (char *) dn2path(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path);
- entry = (Entry *) get_entry(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path);
+ dn2path(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path,
+ &path);
+ entry = (Entry *) get_entry(op, &ni->li_base_path);
if(entry != NULL) {
- rs->sr_err = apply_modify_to_entry(entry, modlst, op, rs);
- if(rs->sr_err == LDAP_SUCCESS) {
- spew_res = spew_entry(entry, path);
- if(spew_res == -1) {
- perror("could not output entry");
- rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
- }
- }
+ rs->sr_err = apply_modify_to_entry(entry, modlst, op, rs);
+ if(rs->sr_err == LDAP_SUCCESS) {
+ ldap_pvt_thread_mutex_lock(&entry2str_mutex);
+ spew_res = spew_entry(entry, &path);
+ ldap_pvt_thread_mutex_unlock(&entry2str_mutex);
+ if(spew_res == -1) {
+ perror("could not output entry");
+ rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+ }
+ }
}
else {
- rs->sr_err = LDAP_NO_SUCH_OBJECT;
+ rs->sr_err = LDAP_NO_SUCH_OBJECT;
}
- if(path != NULL)
- SLAP_FREE(path);
if(entry != NULL)
- entry_free(entry);
+ entry_free(entry);
+ if(path.bv_val != NULL)
+ SLAP_FREE(path.bv_val);
rs->sr_text = NULL;
ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
- ldap_pvt_thread_mutex_unlock(&entry2str_mutex);
send_ldap_result(op, rs);
return 0;
}
static int ldif_back_delete(Operation *op, SlapReply *rs) {
struct ldif_info *ni = (struct ldif_info *) op->o_bd->be_private;
- char * path = NULL;
+ struct berval path = BER_BVNULL;
int res = 0;
ldap_pvt_thread_mutex_lock(&ni->li_mutex);
- path = (char *) dn2path(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path);
- res = unlink(path);
+ dn2path(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path, &path);
+
+ path.bv_val[path.bv_len - STRLENOF(LDIF)] = '\0';
+ res = rmdir(path.bv_val);
+ path.bv_val[path.bv_len - STRLENOF(LDIF)] = '.';
+ if ( res && errno != ENOENT ) {
+ rs->sr_err = LDAP_NOT_ALLOWED_ON_NONLEAF;
+ } else {
+ res = unlink(path.bv_val);
+ }
if(res == -1) {
- if(errno == ENOENT)
- rs->sr_err = LDAP_NO_SUCH_OBJECT;
- else
- rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+ if(errno == ENOENT)
+ rs->sr_err = LDAP_NO_SUCH_OBJECT;
+ else
+ rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
}
else
- rs->sr_err = LDAP_SUCCESS;
+ rs->sr_err = LDAP_SUCCESS;
- SLAP_FREE(path);
+ SLAP_FREE(path.bv_val);
ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
send_ldap_result(op, rs);
return 0;
}
-static int is_leaf_node(char * path) {
- DIR * nonleafnode;
- int path_len = strlen(path);
- char * nonleafpath = (char *) SLAP_MALLOC(sizeof(char) * path_len + 1);
- int res;
-
- strncpy(nonleafpath, path, path_len);
- nonleafpath[path_len - 5] = '\0';
- nonleafnode = opendir(nonleafpath);
- if(nonleafnode == NULL) {
- res = 1;
- }
- else {
- closedir(nonleafnode);
- res = 0;
- }
- SLAP_FREE(nonleafpath);
- return res;
-}
-static int move_entry(Entry * entry, struct berval * ndn,
- struct berval * newndn, struct berval * rootdn,
- struct berval * base_path) {
+static int move_entry(Entry * entry, struct berval * ndn,
+ struct berval * newndn, struct berval * rootdn,
+ struct berval * base_path) {
int res;
int exists_res;
- char * path = (char *) dn2path(ndn, rootdn, base_path);
- char * newpath = (char *) dn2path(newndn, rootdn, base_path);
- int path_len = strlen(path);
+ struct berval path;
+ struct berval newpath;
- if((entry == NULL || path == NULL) || newpath == NULL) { /* some object doesn't exist */
- res = LDAP_NO_SUCH_OBJECT;
- }
- else if(! is_leaf_node(path)) { /* entry is not a leaf node */
- res = LDAP_NOT_ALLOWED_ON_NONLEAF;
+ dn2path(ndn, rootdn, base_path, &path);
+ dn2path(newndn, rootdn, base_path, &newpath);
+
+ if((entry == NULL || path.bv_val == NULL) || newpath.bv_val == NULL) {
+ /* some object doesn't exist */
+ res = LDAP_NO_SUCH_OBJECT;
}
else { /* do the modrdn */
- exists_res = open(newpath, O_RDONLY);
- if(exists_res == -1 && errno == ENOENT) {
- res = spew_entry(entry, newpath);
- if(res != -1) {
- /* if this fails we should log something bad */
- res = unlink(path);
- res = LDAP_SUCCESS;
- }
- else {
- if(errno == ENOENT)
- res = LDAP_NO_SUCH_OBJECT;
- else
- res = LDAP_UNWILLING_TO_PERFORM;
- unlink(newpath); /* in case file was created */
- }
- }
- else if(exists_res) {
- int close_res;
- res = LDAP_ALREADY_EXISTS;
- close_res = close(exists_res);
- if(close_res == -1) {
- /* log heinous error */
- }
- }
- else {
- res = LDAP_UNWILLING_TO_PERFORM;
- }
- }
-
- if(path != NULL)
- SLAP_FREE(path);
- if(newpath != NULL)
- SLAP_FREE(newpath);
+ exists_res = open(newpath.bv_val, O_RDONLY);
+ if(exists_res == -1 && errno == ENOENT) {
+ res = spew_entry(entry, &newpath);
+ if(res != -1) {
+ /* if this fails we should log something bad */
+ res = unlink(path.bv_val);
+ res = LDAP_SUCCESS;
+ }
+ else {
+ if(errno == ENOENT)
+ res = LDAP_NO_SUCH_OBJECT;
+ else
+ res = LDAP_UNWILLING_TO_PERFORM;
+ unlink(newpath.bv_val); /* in case file was created */
+ }
+ }
+ else if(exists_res) {
+ int close_res = close(exists_res);
+ res = LDAP_ALREADY_EXISTS;
+ if(close_res == -1) {
+ /* log heinous error */
+ }
+ }
+ else {
+ res = LDAP_UNWILLING_TO_PERFORM;
+ }
+ }
+
+ if(newpath.bv_val != NULL)
+ SLAP_FREE(newpath.bv_val);
+ if(path.bv_val != NULL)
+ SLAP_FREE(path.bv_val);
return res;
}
static int ldif_back_modrdn(Operation *op, SlapReply *rs) {
struct ldif_info *ni = (struct ldif_info *) op->o_bd->be_private;
- struct berval new_dn = {0, NULL}, new_ndn = {0, NULL};
- struct berval * new_parent_dn = NULL;
- struct berval p_dn, bv = {0, NULL};
+ struct berval new_dn = BER_BVNULL, new_ndn = BER_BVNULL;
+ struct berval p_dn, bv = BER_BVNULL;
Entry * entry = NULL;
LDAPRDN new_rdn = NULL;
LDAPRDN old_rdn = NULL;
ldap_pvt_thread_mutex_lock(&ni->li_mutex);
ldap_pvt_thread_mutex_lock(&entry2str_mutex);
- entry = (Entry *) get_entry(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path);
+ entry = (Entry *) get_entry(op, &ni->li_base_path);
/* build the mods to the entry */
if(entry != NULL) {
- if(ldap_bv2rdn(&op->oq_modrdn.rs_newrdn, &new_rdn, (char **)&rs->sr_text,
- LDAP_DN_FORMAT_LDAP)) {
- rs->sr_err = LDAP_INVALID_DN_SYNTAX;
- }
- else if(op->oq_modrdn.rs_deleteoldrdn &&
- ldap_bv2rdn(&op->o_req_dn, &old_rdn, (char **)&rs->sr_text,
+ if(ldap_bv2rdn(&op->oq_modrdn.rs_newrdn, &new_rdn,
+ (char **)&rs->sr_text, LDAP_DN_FORMAT_LDAP)) {
+ rs->sr_err = LDAP_INVALID_DN_SYNTAX;
+ }
+ else if(op->oq_modrdn.rs_deleteoldrdn &&
+ ldap_bv2rdn(&op->o_req_dn, &old_rdn, (char **)&rs->sr_text,
LDAP_DN_FORMAT_LDAP)) {
- rs->sr_err = LDAP_OTHER;
- }
- else { /* got both rdns successfully, ready to build mods */
- if(slap_modrdn2mods(op, rs, entry, old_rdn, new_rdn, &mods) != LDAP_SUCCESS) {
- rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
- }
- else { /* built mods successfully */
-
- /* build new dn, and new ndn for the entry */
- if(op->oq_modrdn.rs_newSup != NULL) /* new superior */
- p_dn = *op->oq_modrdn.rs_newSup;
- else
- p_dn = slap_empty_bv;
- dnParent(&entry->e_name, &p_dn);
- build_new_dn(&new_dn, &p_dn, &op->oq_modrdn.rs_newrdn, NULL);
- dnNormalize( 0, NULL, NULL, &new_dn, &bv, op->o_tmpmemctx );
- ber_dupbv( &new_ndn, &bv );
- entry->e_name = new_dn;
- entry->e_nname = new_ndn;
-
- /* perform the modifications */
- res = apply_modify_to_entry(entry, mods, op, rs);
- if(res == LDAP_SUCCESS) {
- rs->sr_err = move_entry(entry, &op->o_req_ndn,
- &new_ndn,
- &op->o_bd->be_nsuffix[0],
- &ni->li_base_path);
- }
- else
- rs->sr_err = res;
- }
- }
+ rs->sr_err = LDAP_OTHER;
+ }
+ else { /* got both rdns successfully, ready to build mods */
+ if(slap_modrdn2mods(op, rs, entry, old_rdn, new_rdn, &mods)
+ != LDAP_SUCCESS) {
+ rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+ }
+ else { /* built mods successfully */
+
+ /* build new dn, and new ndn for the entry */
+ if(op->oq_modrdn.rs_newSup != NULL) /* new superior */
+ p_dn = *op->oq_modrdn.rs_newSup;
+ else
+ p_dn = slap_empty_bv;
+ dnParent(&entry->e_name, &p_dn);
+ build_new_dn(&new_dn, &p_dn, &op->oq_modrdn.rs_newrdn, NULL);
+ dnNormalize( 0, NULL, NULL, &new_dn, &bv, op->o_tmpmemctx );
+ ber_dupbv( &new_ndn, &bv );
+ entry->e_name = new_dn;
+ entry->e_nname = new_ndn;
+
+ /* perform the modifications */
+ res = apply_modify_to_entry(entry, mods, op, rs);
+ if(res == LDAP_SUCCESS) {
+ rs->sr_err = move_entry(entry, &op->o_req_ndn,
+ &new_ndn,
+ &op->o_bd->be_nsuffix[0],
+ &ni->li_base_path);
+ }
+ else
+ rs->sr_err = res;
+ }
+ }
}
else /* entry was null */
- rs->sr_err = LDAP_NO_SUCH_OBJECT;
+ rs->sr_err = LDAP_NO_SUCH_OBJECT;
if(entry != NULL)
- entry_free(entry);
+ entry_free(entry);
rs->sr_text = "";
ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
ldap_pvt_thread_mutex_unlock(&entry2str_mutex);
ldap_pvt_thread_mutex_lock(&ni->li_mutex);
- e = (Entry *) get_entry(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path);
+ e = (Entry *) get_entry(op, &ni->li_base_path);
if(e != NULL) {
- for(a = attrs_find( e->e_attrs, op->oq_compare.rs_ava->aa_desc );
- a != NULL;
- a = attrs_find( a->a_next, op->oq_compare.rs_ava->aa_desc ))
- {
- rs->sr_err = LDAP_COMPARE_FALSE;
-
- if (value_find_ex(op->oq_compare.rs_ava->aa_desc,
- SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
- SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
- a->a_nvals, &op->oq_compare.rs_ava->aa_value,
- op->o_tmpmemctx ) == 0)
- {
- rs->sr_err = LDAP_COMPARE_TRUE;
- break;
- }
- }
+ for(a = attrs_find( e->e_attrs, op->oq_compare.rs_ava->aa_desc );
+ a != NULL;
+ a = attrs_find( a->a_next, op->oq_compare.rs_ava->aa_desc )) {
+ rs->sr_err = LDAP_COMPARE_FALSE;
+
+ if (value_find_ex(op->oq_compare.rs_ava->aa_desc,
+ SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
+ SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
+ a->a_nvals, &op->oq_compare.rs_ava->aa_value,
+ op->o_tmpmemctx ) == 0) {
+ rs->sr_err = LDAP_COMPARE_TRUE;
+ break;
+ }
+ }
}
else {
- rs->sr_err = LDAP_NO_SUCH_OBJECT;
+ rs->sr_err = LDAP_NO_SUCH_OBJECT;
}
if(e != NULL)
- entry_free(e);
+ entry_free(e);
ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
send_ldap_result(op, rs);
return 0;
}
static int ldif_tool_entry_open(BackendDB * be, int mode) {
- struct ldif_info *ni = (struct ldif_info *) be->be_private;
- ni->tool_entries = NULL;
- ni->tool_numentries = 0;
- ni->tool_current = 0;
- ni->tool_put_entry_flag = 0;
+ struct ldif_info *ni = (struct ldif_info *) be->be_private;
+ ni->li_tool_current = 0;
return 0;
}
static int ldif_tool_entry_close(BackendDB * be) {
- struct ldif_info *ni = (struct ldif_info *) be->be_private;
- int i;
- /*if(ni->tool_entries != NULL) {
- for(i=0;i<ni->tool_numentries;i++) {
- SLAP_FREE(ni->tool_entries[i]);
- }*/
- SLAP_FREE(ni->tool_entries);
+ struct ldif_info *ni = (struct ldif_info *) be->be_private;
+
+ SLAP_FREE(ni->li_tool_cookie.entries);
return 0;
}
-static ID ldif_tool_entry_first(BackendDB *be) {
- struct ldif_info *ni = (struct ldif_info *) be->be_private;
+static ID
+ldif_tool_entry_first(BackendDB *be)
+{
+ struct ldif_info *ni = (struct ldif_info *) be->be_private;
ID id = 1; /* first entry in the array of entries shifted by one */
- ni->tool_current = 1;
- if(ni->tool_entries == NULL || ni->tool_put_entry_flag) {
- ni->tool_entries = (Entry **) enum_tree(&ni->li_base_path, &ni->tool_numentries);
- ni->tool_put_entry_flag = 0;
+
+ ni->li_tool_current = 1;
+ if(ni->li_tool_cookie.entries == NULL) {
+ Operation op = {0};
+
+ op.o_bd = be;
+ op.o_req_dn = *be->be_suffix;
+ op.o_req_ndn = *be->be_nsuffix;
+ op.ors_scope = LDAP_SCOPE_SUBTREE;
+ ni->li_tool_cookie.op = &op;
+ (void)enum_tree( &ni->li_tool_cookie );
+ ni->li_tool_cookie.op = NULL;
}
return id;
}
-static ID ldif_tool_entry_next(BackendDB *be) {
- struct ldif_info *ni = (struct ldif_info *) be->be_private;
- ni->tool_current += 1;
- if(ni->tool_put_entry_flag) {
- ni->tool_entries = (Entry **) enum_tree(&ni->li_base_path, &ni->tool_numentries);
- ni->tool_put_entry_flag = 0;
- }
- if(ni->tool_current > ni->tool_numentries)
- return NOID;
+static ID ldif_tool_entry_next(BackendDB *be)
+{
+ struct ldif_info *ni = (struct ldif_info *) be->be_private;
+ ni->li_tool_current += 1;
+ if(ni->li_tool_current > ni->li_tool_cookie.eind)
+ return NOID;
else
- return ni->tool_current;
+ return ni->li_tool_current;
}
static Entry * ldif_tool_entry_get(BackendDB * be, ID id) {
- struct ldif_info *ni = (struct ldif_info *) be->be_private;
+ struct ldif_info *ni = (struct ldif_info *) be->be_private;
Entry * e;
- if(id > ni->tool_numentries || id < 1)
- return NULL;
+ if(id > ni->li_tool_cookie.eind || id < 1)
+ return NULL;
else {
- e = ni->tool_entries[id - 1];
- ni->tool_entries[id - 1] = NULL;
- return e;
+ e = ni->li_tool_cookie.entries[id - 1];
+ ni->li_tool_cookie.entries[id - 1] = NULL;
+ return e;
}
}
static ID ldif_tool_entry_put(BackendDB * be, Entry * e, struct berval *text) {
- struct ldif_info *ni = (struct ldif_info *) be->be_private;
- Attribute *save_attrs;
+ struct ldif_info *ni = (struct ldif_info *) be->be_private;
struct berval dn = e->e_nname;
- char * leaf_path = NULL;
- char * base = NULL;
- char * base_ldif = NULL;
+ struct berval leaf_path = BER_BVNULL;
struct stat stats;
int statres;
- char textbuf[SLAP_TEXT_BUFLEN];
- size_t textlen = sizeof textbuf;
int res = LDAP_SUCCESS;
- leaf_path = (char *) dn2path(&dn, &be->be_nsuffix[0], &ni->li_base_path);
-
- /* save_attrs = e->e_attrs; why?
- e->e_attrs = attrs_dup(e->e_attrs);*/
-
- if(leaf_path != NULL) {
- char * tmp;
- /* build path to container, and path to ldif of container */
- base = (char *) get_parent_path(leaf_path);
- base_ldif = (char *) SLAP_MALLOC(sizeof(char) * (strlen(base) + 6));
- tmp = (char *) lutil_strcopy(base_ldif, base);
- lutil_strcopy(tmp, LDIF);
-
- statres = stat(base, &stats); /* check if container exists */
- if(statres == -1 && errno == ENOENT) { /* container missing */
- statres = stat(base_ldif, &stats); /* check for leaf node */
- if(statres == -1 && errno == ENOENT) {
- res = LDAP_NO_SUCH_OBJECT; /* parent doesn't exist */
- }
- else if(statres != -1) { /* create parent */
- int mkdirres = mkdir(base, 0750);
- if(mkdirres == -1) {
- res = LDAP_UNWILLING_TO_PERFORM;
- }
- }
- else
- res = LDAP_UNWILLING_TO_PERFORM;
- }/* container was possibly created, move on to add the entry */
- if(res == LDAP_SUCCESS) {
- statres = stat(leaf_path, &stats);
- if(statres == -1 && errno == ENOENT) {
- res = (int) spew_entry(e, leaf_path);
- }
- else /* it already exists */
- res = LDAP_ALREADY_EXISTS;
- }
- }
-
- if(leaf_path != NULL)
- SLAP_FREE(leaf_path);
- if(base != NULL)
- SLAP_FREE(base);
- if(base_ldif != NULL)
- SLAP_FREE(base_ldif);
+ dn2path(&dn, &be->be_nsuffix[0], &ni->li_base_path, &leaf_path);
+
+ if(leaf_path.bv_val != NULL) {
+ struct berval base = BER_BVNULL;
+ /* build path to container, and path to ldif of container */
+ get_parent_path(&leaf_path, &base);
+
+ statres = stat(base.bv_val, &stats); /* check if container exists */
+ if(statres == -1 && errno == ENOENT) { /* container missing */
+ base.bv_val[base.bv_len] = '.';
+ statres = stat(base.bv_val, &stats); /* check for leaf node */
+ base.bv_val[base.bv_len] = '\0';
+ if(statres == -1 && errno == ENOENT) {
+ res = LDAP_NO_SUCH_OBJECT; /* parent doesn't exist */
+ }
+ else if(statres != -1) { /* create parent */
+ int mkdirres = mkdir(base.bv_val, 0750);
+ if(mkdirres == -1) {
+ res = LDAP_UNWILLING_TO_PERFORM;
+ }
+ }
+ else
+ res = LDAP_UNWILLING_TO_PERFORM;
+ }/* container was possibly created, move on to add the entry */
+ if(res == LDAP_SUCCESS) {
+ statres = stat(leaf_path.bv_val, &stats);
+ if(statres == -1 && errno == ENOENT) {
+ res = (int) spew_entry(e, &leaf_path);
+ }
+ else /* it already exists */
+ res = LDAP_ALREADY_EXISTS;
+ }
+ SLAP_FREE(base.bv_val);
+ SLAP_FREE(leaf_path.bv_val);
+ }
+
if(res == LDAP_SUCCESS) {
- ni->tool_put_entry_flag = 1;
- return 1;
+ return 1;
}
else
- return NOID;
+ return NOID;
}
static int
ni = ch_calloc( 1, sizeof(struct ldif_info) );
be->be_private = ni;
- be->be_cf_table = be->bd_info->bi_cf_table;
+ be->be_cf_ocs = ldifocs;
ldap_pvt_thread_mutex_init(&ni->li_mutex);
return 0;
}
static int
ldif_back_db_destroy(
- Backend *be
- )
+ Backend *be
+ )
{
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;
static int
ldif_back_db_open(
- Backend *be
- )
+ Backend *be
+ )
{
struct ldif_info *ni = (struct ldif_info *) be->be_private;
if( BER_BVISEMPTY(&ni->li_base_path)) {/* missing base path */
- fprintf(stderr, "missing base path for back-ldif\n");
- return 1;
+ fprintf(stderr, "missing base path for back-ldif\n");
+ return 1;
}
return 0;
}
int
ldif_back_initialize(
- BackendInfo *bi
- )
+ BackendInfo *bi
+ )
{
+ static char *controls[] = {
+ LDAP_CONTROL_MANAGEDSAIT,
+ NULL
+ };
int rc;
- bi->bi_cf_table = ldifcfg;
+ bi->bi_flags |=
+ SLAP_BFLAG_INCREMENT |
+ SLAP_BFLAG_REFERRALS;
+
+ bi->bi_controls = controls;
bi->bi_open = 0;
bi->bi_close = 0;
bi->bi_extended = 0;
- bi->bi_chk_referrals = 0;
+ bi->bi_chk_referrals = ldif_back_referrals;
bi->bi_connection_init = 0;
bi->bi_connection_destroy = 0;
bi->bi_tool_id2entry_get = 0;
bi->bi_tool_entry_modify = 0;
- rc = init_config_attrs( ldifcfg );
+ bi->bi_cf_ocs = ldifocs;
+
+ rc = config_register_schema( ldifcfg, ldifocs );
if ( rc ) return rc;
- ldifcfg[0].ad = slap_schema.si_ad_objectClass;
- rc = init_config_ocs( ldifocs );
- return rc;
+ return 0;
}
projects / openldap / blobdiff