X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fctxcsn.c;h=3849034290ab1a0832ed57cf0acd5bff2cc2b81d;hb=9777dc21148eaba94326aa41d851d558d8869b0e;hp=1f9f1c08bec4454e3e107db2f754c170bc245de4;hpb=3be0b77c88768dba1b943811dbc63fd69f1d45f7;p=openldap
diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index 1f9f1c08be..3849034290 100644
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -1,23 +1,18 @@
+/* ctxcsn.c -- Context CSN Management Routines */
/* $OpenLDAP$ */
-/*
- * Context CSN Management Routines
- */
-/* Copyright (c) 2003 by International Business Machines, Inc.
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2003 The OpenLDAP Foundation.
+ * Portions Copyright 2003 IBM Corporation.
+ * All rights reserved.
*
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
*
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -26,85 +21,84 @@
#include
#include
-#include
#include "ldap_pvt.h"
#include "lutil.h"
#include "slap.h"
#include "lutil_ldap.h"
-#ifdef LDAP_SYNC
+const struct berval slap_ldapsync_bv = BER_BVC("ldapsync");
+const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
-struct berval *
-slap_get_commit_csn( Operation *op )
+void
+slap_get_commit_csn( Operation *op, struct berval *csn )
{
- struct berval *max_committed_csn = NULL;
- struct slap_csn_entry *csne = NULL, *committed_csne = NULL;
+ struct slap_csn_entry *csne, *committed_csne = NULL;
int i = 0;
+ csn->bv_val = NULL;
+ csn->bv_len = 0;
+
ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
- if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+ if ( csne->opid == op->o_opid && csne->connid == op->o_connid ) {
+ csne->state = SLAP_CSN_COMMIT;
break;
- }
-
- if ( csne ) {
- csne->state = SLAP_CSN_COMMIT;
+ }
}
LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
- if ( csne->state == SLAP_CSN_COMMIT )
- committed_csne = csne;
- if ( csne->state == SLAP_CSN_PENDING )
- break;
+ if ( csne->state == SLAP_CSN_COMMIT ) committed_csne = csne;
+ if ( csne->state == SLAP_CSN_PENDING ) break;
}
- ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
-
if ( committed_csne ) {
- max_committed_csn = ber_dupbv( NULL, committed_csne->csn );
+ ber_dupbv( csn, committed_csne->csn );
}
- return max_committed_csn;
+ ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
+
}
void
slap_rewind_commit_csn( Operation *op )
{
- struct slap_csn_entry *csne = NULL;
+ struct slap_csn_entry *csne;
ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
- if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+ if ( csne->opid == op->o_opid && csne->connid == op->o_connid ) {
+ csne->state = SLAP_CSN_PENDING;
break;
+ }
}
- if ( csne ) {
- csne->state = SLAP_CSN_PENDING;
- }
-
ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
}
void
slap_graduate_commit_csn( Operation *op )
{
- struct slap_csn_entry *csne = NULL;
+ struct slap_csn_entry *csne;
+
+ if ( op == NULL )
+ return;
+
+ if ( op->o_bd == NULL )
+ return;
ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
- if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+ if ( csne->opid == op->o_opid && csne->connid == op->o_connid ) {
+ LDAP_TAILQ_REMOVE( &op->o_bd->be_pending_csn_list, csne, csn_link );
+ ch_free( csne->csn->bv_val );
+ ch_free( csne->csn );
+ ch_free( csne );
break;
- }
-
- if ( csne ) {
- LDAP_TAILQ_REMOVE( &op->o_bd->be_pending_csn_list, csne, csn_link );
- ch_free( csne->csn->bv_val );
- ch_free( csne->csn );
- ch_free( csne );
+ }
}
ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
@@ -112,207 +106,78 @@ slap_graduate_commit_csn( Operation *op )
return;
}
+static struct berval ocbva[] = {
+ BER_BVC("top"),
+ BER_BVC("subentry"),
+ BER_BVC("syncProviderSubentry"),
+ {0,NULL}
+};
+
Entry *
slap_create_context_csn_entry(
Backend *be,
struct berval *context_csn
)
{
- Modifications *ml;
- Modifications *mlnext;
- Modifications *mod;
- Modifications *modlist;
- Modifications **modtail = &modlist;
-
- struct berval* ocbva = NULL;
- struct berval* socbva = NULL;
- struct berval* cnbva = NULL;
- struct berval* ssbva = NULL;
- struct berval* scbva = NULL;
-
- char substr[64];
- char rdnstr[67];
- const char *text;
- char txtbuf[SLAP_TEXT_BUFLEN];
- size_t textlen = sizeof txtbuf;
-
Entry* e;
int rc;
- struct berval sub_bv = { 0, NULL };
- struct berval psubrdn = { 0, NULL };
-
- slap_callback cb;
- SlapReply rs = {REP_RESULT};
-
- struct berval rdn = { 0, NULL };
- int match = 0;
- char *def_filter_str = NULL;
-
- ocbva = ( struct berval * ) ch_calloc( 4, sizeof( struct berval ));
- socbva = ( struct berval * ) ch_calloc( 2, sizeof( struct berval ));
- cnbva = ( struct berval * ) ch_calloc( 2, sizeof( struct berval ));
- ssbva = ( struct berval * ) ch_calloc( 2, sizeof( struct berval ));
- scbva = ( struct berval * ) ch_calloc( 2, sizeof( struct berval ));
-
- ber_str2bv( "top", strlen("top"), 1, &ocbva[0] );
- ber_str2bv( "subentry", strlen("subentry"), 1, &ocbva[1] );
- ber_str2bv( "syncProviderSubentry",
- strlen("syncProviderSubentry"), 1, &ocbva[2] );
- ocbva[3].bv_len = 0;
- ocbva[3].bv_val = NULL;
-
- mod = (Modifications *) ch_malloc( sizeof( Modifications ));
- mod->sml_op = LDAP_MOD_REPLACE;
- mod->sml_next = NULL;
- mod->sml_desc = NULL;
- ber_str2bv( "objectClass", strlen("objectClass"), 1, &mod->sml_type );
- mod->sml_bvalues = ocbva;
- mod->sml_nvalues = ocbva;
- *modtail = mod;
- modtail = &mod->sml_next;
-
- ber_str2bv( "syncProviderSubentry",
- strlen("syncProviderSubentry"), 1, &socbva[0] );
- socbva[1].bv_len = 0;
- socbva[1].bv_val = NULL;
-
- mod = (Modifications *) ch_malloc( sizeof( Modifications ));
- mod->sml_op = LDAP_MOD_REPLACE;
- mod->sml_next = NULL;
- mod->sml_desc = NULL;
- ber_str2bv( "structuralObjectClass", strlen("structuralObjectClass"), 1, &mod->sml_type );
- mod->sml_bvalues = socbva;
- mod->sml_nvalues = socbva;
- *modtail = mod;
- modtail = &mod->sml_next;
-
- sprintf( substr, "ldapsync" );
- sprintf( rdnstr, "cn=%s", substr );
- ber_str2bv( substr, strlen( substr ), 1, &cnbva[0] );
- ber_str2bv( rdnstr, strlen( rdnstr ), 1, &psubrdn );
- cnbva[1].bv_len = 0;
- cnbva[1].bv_val = NULL;
- mod = (Modifications *) ch_malloc( sizeof( Modifications ));
- mod->sml_op = LDAP_MOD_REPLACE;
- mod->sml_next = NULL;
- mod->sml_desc = NULL;
- ber_str2bv( "cn", strlen("cn"), 1, &mod->sml_type );
- mod->sml_bvalues = cnbva;
- mod->sml_nvalues = cnbva;
- *modtail = mod;
- modtail = &mod->sml_next;
+ struct berval bv;
- if ( context_csn ) {
- ber_dupbv( &scbva[0], context_csn );
- scbva[1].bv_len = 0;
- scbva[1].bv_val = NULL;
- mod = (Modifications *) ch_malloc( sizeof( Modifications ));
- mod->sml_op = LDAP_MOD_REPLACE;
- mod->sml_next = NULL;
- mod->sml_desc = NULL;
- ber_str2bv( "contextCSN", strlen("contextCSN"), 1, &mod->sml_type );
- mod->sml_bvalues = scbva;
- mod->sml_nvalues = scbva;
- *modtail = mod;
- modtail = &mod->sml_next;
- }
-
- ber_str2bv( "{}", strlen("{}"), 1, &ssbva[0] );
- ssbva[1].bv_len = 0;
- ssbva[1].bv_val = NULL;
- mod = (Modifications *) ch_malloc( sizeof( Modifications ));
- mod->sml_op = LDAP_MOD_REPLACE;
- mod->sml_next = NULL;
- mod->sml_desc = NULL;
- ber_str2bv( "subtreeSpecification",
- strlen("subtreeSpecification"), 1, &mod->sml_type );
- mod->sml_bvalues = ssbva;
- mod->sml_nvalues = ssbva;
- *modtail = mod;
- modtail = &mod->sml_next;
-
- rc = slap_mods_check( modlist, 1, &text, txtbuf, textlen, NULL );
-
- if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "create_context_csn_entry: mods check (%s)\n", text, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "create_context_csn_entry: mods check (%s)\n",
- text, 0, 0 );
-#endif
- }
-
- e = ( Entry * ) ch_calloc( 1, sizeof( Entry ));
+ e = (Entry *) ch_calloc( 1, sizeof( Entry ));
- build_new_dn( &sub_bv, &be->be_nsuffix[0], &psubrdn );
- dnPrettyNormal( NULL, &sub_bv, &e->e_name, &e->e_nname, NULL );
- ch_free( sub_bv.bv_val );
- ch_free( psubrdn.bv_val );
+ attr_merge( e, slap_schema.si_ad_objectClass,
+ ocbva, NULL );
+ attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
+ &ocbva[1], NULL );
+ attr_merge_one( e, slap_schema.si_ad_cn,
+ (struct berval *)&slap_ldapsync_bv, NULL );
- e->e_attrs = NULL;
+ if ( context_csn ) {
+ attr_merge_one( e, slap_schema.si_ad_contextCSN,
+ context_csn, NULL );
+ }
- rc = slap_mods2entry( modlist, &e, 1, 1, &text, txtbuf, textlen );
+ bv.bv_val = "{}";
+ bv.bv_len = sizeof("{}")-1;
+ attr_merge_one( e, slap_schema.si_ad_subtreeSpecification, &bv, NULL );
- if( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "create_context_csn_entry: mods2entry (%s)\n", text, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "create_context_csn_entry: mods2entry (%s)\n",
- text, 0, 0 );
-#endif
- }
+ build_new_dn( &e->e_name, &be->be_nsuffix[0],
+ (struct berval *)&slap_ldapsync_cn_bv, NULL );
+ ber_dupbv( &e->e_nname, &e->e_name );
return e;
}
-static int
-slap_contextcsn_callback(
- Operation* op,
- SlapReply* rs
-)
-{
- if ( rs->sr_type != REP_SEARCH ) {
- *((int*)op->o_callback->sc_private) = 0;
- } else {
- *((int*)op->o_callback->sc_private) = 1;
- }
- return LDAP_SUCCESS;
-}
-
int
slap_get_csn(
Operation *op,
- const char *csnbuf,
+ char *csnbuf,
int len,
struct berval *csn,
int manage_ctxcsn
)
{
- struct slap_csn_entry *pending;
-
- if ( manage_ctxcsn ) {
- pending = (struct slap_csn_entry *) ch_calloc( 1, sizeof( struct slap_csn_entry ));
- }
+ struct slap_csn_entry *pending;
- if ( csn == NULL )
- return LDAP_OTHER;
+ if ( csn == NULL ) return LDAP_OTHER;
csn->bv_len = lutil_csnstr( csnbuf, len, 0, 0 );
csn->bv_val = csnbuf;
if ( manage_ctxcsn ) {
+ pending = (struct slap_csn_entry *) ch_calloc( 1,
+ sizeof( struct slap_csn_entry ));
ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
+ ber_dupbv( &op->o_sync_csn, csn );
pending->csn = ber_dupbv( NULL, csn );
pending->connid = op->o_connid;
pending->opid = op->o_opid;
pending->state = SLAP_CSN_PENDING;
- LDAP_TAILQ_INSERT_TAIL( &op->o_bd->be_pending_csn_list, pending, csn_link );
+ LDAP_TAILQ_INSERT_TAIL( &op->o_bd->be_pending_csn_list,
+ pending, csn_link );
ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
}
return LDAP_SUCCESS;
}
-#endif