/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2005 The OpenLDAP Foundation.
+ * Copyright 2005-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
ldap_pvt_thread_mutex_t li_mutex;
};
+#ifdef _WIN32
+#define mkdir(a,b) mkdir(a)
+#endif
+
#define LDIF ".ldif"
#define IX_DNL '{'
#define ENTRY_BUFF_INCREMENT 500
-static ObjectClass *ldif_oc;
-
-static ConfigDriver ldif_cf;
-
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),
"( OLcfgDbAt:0.1 NAME 'olcDbDirectory' "
"NAME 'olcLdifConfig' "
"DESC 'LDIF backend configuration' "
"SUP olcDatabaseConfig "
- "MUST ( olcDbDirectory ) )", Cft_Database,
- &ldif_oc },
+ "MUST ( olcDbDirectory ) )", Cft_Database, ldifcfg },
{ NULL, 0, NULL }
};
-static int
-ldif_cf( ConfigArgs *c )
-{
- if ( c->op == SLAP_CONFIG_EMIT ) {
- value_add_one( &c->rvalue_vals, &ldif_oc->soc_cname );
- return 0;
- }
- return 1;
-}
-
static void
dn2path(struct berval * dn, struct berval * rootdn, struct berval * base_path,
struct berval *res)
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");
+ Debug( LDAP_DEBUG_ANY, "could not spew write: %s\n",
+ strerror( errno ), 0, 0 );
return -1;
}
else {
- spewptr += writeres;
- written += writeres;
+ spew += writeres;
+ len -= writeres;
}
}
return writeres;
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;
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;
fd = open(path.bv_val, O_RDONLY);
/* error opening file (mebbe should log error) */
if(fd == -1) {
- perror("failed to open file");
+ Debug(LDAP_DEBUG_ANY, "failed to open file \"%s\": %s\n",
+ path.bv_val, strerror(errno), 0 );
}
if(path.bv_val != NULL)
fd = open( path->bv_val, O_RDONLY );
if ( fd < 0 ) {
- Debug( LDAP_DEBUG_TRACE,
+ Debug( LDAP_DEBUG_ANY,
"=> ldif_enum_tree: failed to open %s\n",
path->bv_val, 0, 0 );
return LDAP_NO_SUCH_OBJECT;
ck->op->oq_search.rs_scope == LDAP_SCOPE_ONELEVEL
? LDAP_SCOPE_BASE : LDAP_SCOPE_SUBTREE );
- send_search_reference( ck->op, ck->rs );
-
+ ck->rs->sr_entry = e;
+ rc = send_search_reference( ck->op, ck->rs );
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;
- send_search_entry(ck->op, ck->rs);
+ rc = send_search_entry(ck->op, ck->rs);
+ ck->rs->sr_entry = NULL;
}
fd = 1;
+ if ( rc )
+ goto done;
} else {
/* Queueing up for tool mode */
if(ck->entries == NULL) {
/* it shouldn't be treated as an error
* only if the directory doesn't exist */
rc = LDAP_BUSY;
- Debug( LDAP_DEBUG_TRACE,
+ Debug( LDAP_DEBUG_ANY,
"=> ldif_enum_tree: failed to opendir %s (%d)\n",
path->bv_val, errno, 0 );
}
- goto leave;
+ goto done;
}
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 */
}
}
- 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;
}
list = ptr->next;
- 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 );
- r_enum_tree(ck, &fpath, &e->e_name, &e->e_nname );
- free(fpath.bv_val);
+ 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);
}
}
-leave:
+done:
if ( fd ) entry_free( e );
return rc;
}
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 */
get_permissiveModify(op),
&rs->sr_text, textbuf,
sizeof( textbuf ) );
-
break;
case LDAP_MOD_REPLACE:
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,
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, entry, NULL, 0,
+ &rs->sr_text, textbuf, sizeof( textbuf ) );
}
return rc;
}
rs->sr_matched = NULL;
ber_bvarray_free( refs );
-
- entry_free( entry );
}
+ entry_free( entry );
+
return rc;
}
static int ldif_back_search(Operation *op, SlapReply *rs)
{
struct ldif_info *ni = (struct ldif_info *) op->o_bd->be_private;
- enumCookie ck = {0};
+ enumCookie ck = { NULL, NULL, NULL, 0, 0 };
ck.op = op;
ck.rs = 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 ) );
+ slap_add_opattrs( op, &rs->sr_text, textbuf, sizeof( textbuf ), 1 );
+
+ rs->sr_err = entry_schema_check(op, 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);
send_res:
send_ldap_result(op, rs);
+ slap_graduate_commit_csn( op );
return 0;
}
Entry * entry = NULL;
int spew_res;
+ slap_mods_opattrs( op, &op->orm_modlist, 1 );
+
ldap_pvt_thread_mutex_lock(&ni->li_mutex);
dn2path(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path,
&path);
if(entry != NULL) {
rs->sr_err = apply_modify_to_entry(entry, modlst, op, rs);
if(rs->sr_err == LDAP_SUCCESS) {
+ int save_errno;
ldap_pvt_thread_mutex_lock(&entry2str_mutex);
spew_res = spew_entry(entry, &path);
+ save_errno = errno;
ldap_pvt_thread_mutex_unlock(&entry2str_mutex);
if(spew_res == -1) {
- perror("could not output entry");
+ Debug( LDAP_DEBUG_ANY,
+ "%s ldif_back_modify: could not output entry \"%s\": %s\n",
+ op->o_log_prefix, entry->e_name.bv_val, strerror( save_errno ) );
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
}
}
rs->sr_text = NULL;
ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
send_ldap_result(op, rs);
+ slap_graduate_commit_csn( op );
return 0;
}
struct berval path = BER_BVNULL;
int res = 0;
+ if ( BER_BVISEMPTY( &op->o_csn )) {
+ struct berval csn;
+ char csnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
+
+ csn.bv_val = csnbuf;
+ csn.bv_len = sizeof( csnbuf );
+ slap_get_csn( op, &csn, 1 );
+ }
+
ldap_pvt_thread_mutex_lock(&ni->li_mutex);
dn2path(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path, &path);
SLAP_FREE(path.bv_val);
ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
send_ldap_result(op, rs);
+ slap_graduate_commit_csn( op );
return 0;
}
return res;
}
-static int ldif_back_modrdn(Operation *op, SlapReply *rs) {
+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 = BER_BVNULL, new_ndn = BER_BVNULL;
- struct berval p_dn, bv = BER_BVNULL;
+ struct berval p_dn;
Entry * entry = NULL;
- LDAPRDN new_rdn = NULL;
- LDAPRDN old_rdn = NULL;
- Modifications * mods = NULL;
int res;
- ldap_pvt_thread_mutex_lock(&ni->li_mutex);
- ldap_pvt_thread_mutex_lock(&entry2str_mutex);
- entry = (Entry *) get_entry(op, &ni->li_base_path);
+ slap_mods_opattrs( op, &op->orr_modlist, 1 );
+
+ ldap_pvt_thread_mutex_lock( &ni->li_mutex );
+ ldap_pvt_thread_mutex_lock( &entry2str_mutex );
+ 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,
- LDAP_DN_FORMAT_LDAP)) {
- rs->sr_err = LDAP_OTHER;
+ if ( entry != NULL ) {
+ /* 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;
}
- 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;
- }
+ 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, &new_ndn, NULL );
+ ber_memfree_x( entry->e_name.bv_val, NULL );
+ ber_memfree_x( entry->e_nname.bv_val, NULL );
+ entry->e_name = new_dn;
+ entry->e_nname = new_ndn;
+
+ /* perform the modifications */
+ res = apply_modify_to_entry( entry, op->orr_modlist, 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 */
+ } else {
+ /* entry was null */
rs->sr_err = LDAP_NO_SUCH_OBJECT;
+ }
- if(entry != NULL)
- entry_free(entry);
+ if ( entry != NULL ) {
+ entry_free( entry );
+ }
rs->sr_text = "";
- ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
- ldap_pvt_thread_mutex_unlock(&entry2str_mutex);
- send_ldap_result(op, rs);
+ ldap_pvt_thread_mutex_unlock( &ni->li_mutex );
+ ldap_pvt_thread_mutex_unlock( &entry2str_mutex );
+ send_ldap_result( op, rs );
+ slap_graduate_commit_csn( op );
return 0;
}
-static int ldif_back_compare(Operation *op, SlapReply *rs) {
+/* return LDAP_SUCCESS IFF we can retrieve the specified entry.
+ */
+int ldif_back_entry_get(
+ Operation *op,
+ struct berval *ndn,
+ ObjectClass *oc,
+ AttributeDescription *at,
+ int rw,
+ Entry **ent )
+{
struct ldif_info *ni = (struct ldif_info *) op->o_bd->be_private;
- Entry * e = NULL;
- Attribute *a;
- ldap_pvt_thread_mutex_lock(&ni->li_mutex);
+ ldap_pvt_thread_mutex_lock( &ni->li_mutex );
- 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;
- }
- }
- }
- else {
- rs->sr_err = LDAP_NO_SUCH_OBJECT;
- }
+ *ent = (Entry *) get_entry( op, &ni->li_base_path );
- if(e != NULL)
- entry_free(e);
- ldap_pvt_thread_mutex_unlock(&ni->li_mutex);
- send_ldap_result(op, rs);
- return 0;
+ ldap_pvt_thread_mutex_unlock( &ni->li_mutex );
+
+ return ( *ent == NULL ? 1 : 0 );
}
static int ldif_tool_entry_open(BackendDB * be, int mode) {
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;
}
)
{
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;
{
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");
+ Debug( LDAP_DEBUG_ANY, "missing base path for back-ldif\n", 0, 0, 0);
return 1;
}
return 0;
int rc;
bi->bi_flags |=
+ SLAP_BFLAG_INCREMENT |
SLAP_BFLAG_REFERRALS;
bi->bi_controls = controls;
- bi->bi_cf_table = ldifcfg;
-
bi->bi_open = 0;
bi->bi_close = 0;
bi->bi_config = 0;
bi->bi_op_bind = ldif_back_bind;
bi->bi_op_unbind = 0;
bi->bi_op_search = ldif_back_search;
- bi->bi_op_compare = ldif_back_compare;
+ bi->bi_op_compare = 0;
bi->bi_op_modify = ldif_back_modify;
bi->bi_op_modrdn = ldif_back_modrdn;
bi->bi_op_add = ldif_back_add;
bi->bi_connection_init = 0;
bi->bi_connection_destroy = 0;
+ bi->bi_entry_get_rw = ldif_back_entry_get;
+
+#if 0 /* NOTE: uncomment to completely disable access control */
+#ifdef SLAP_OVERLAY_ACCESS
+ bi->bi_access_allowed = slap_access_always_allowed;
+#endif /* SLAP_OVERLAY_ACCESS */
+#endif
+
bi->bi_tool_entry_open = ldif_tool_entry_open;
bi->bi_tool_entry_close = ldif_tool_entry_close;
bi->bi_tool_entry_first = ldif_tool_entry_first;
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;
- ldifcfg[0].ad = slap_schema.si_ad_objectClass;
return 0;
}
projects / openldap / blobdiff