ITS#6533 put rid first, in front of url

[openldap] / servers / slapd / ctxcsn.c

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index cb828999ccfea8d971949cf05858ae5358cfcf7f..26f59dc837f4e0bd7c24983e409a41ee94c04a99 100644 (file)
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2009 The OpenLDAP Foundation.
+ * Copyright 2003-2010 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -26,9 +26,11 @@
 #include "slap.h"
 #include "lutil_ldap.h"
 
+const struct berval slap_ldapsync_bv = BER_BVC("ldapsync");
+const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
 int slap_serverID;
 
-/* maxcsn->bv_val must point to a char buf[LDAP_LUTIL_CSNSTR_BUFSIZE] */
+/* maxcsn->bv_val must point to a char buf[LDAP_PVT_CSNSTR_BUFSIZE] */
 void
 slap_get_commit_csn(
        Operation *op,
@@ -42,7 +44,7 @@ slap_get_commit_csn(
 
        if ( maxcsn ) {
                assert( maxcsn->bv_val != NULL );
-               assert( maxcsn->bv_len >= LDAP_LUTIL_CSNSTR_BUFSIZE );
+               assert( maxcsn->bv_len >= LDAP_PVT_CSNSTR_BUFSIZE );
        }
        if ( foundit ) {
                *foundit = 0;
@@ -133,6 +135,46 @@ slap_graduate_commit_csn( Operation *op )
        return;
 }
 
+static struct berval ocbva[] = {
+       BER_BVC("top"),
+       BER_BVC("subentry"),
+       BER_BVC("syncProviderSubentry"),
+       BER_BVNULL
+};
+
+Entry *
+slap_create_context_csn_entry(
+       Backend *be,
+       struct berval *context_csn )
+{
+       Entry* e;
+
+       struct berval bv;
+
+       e = entry_alloc();
+
+       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 );
+
+       if ( context_csn ) {
+               attr_merge_one( e, slap_schema.si_ad_contextCSN,
+                       context_csn, NULL );
+       }
+
+       BER_BVSTR( &bv, "{}" );
+       attr_merge_one( e, slap_schema.si_ad_subtreeSpecification, &bv, NULL );
+
+       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;
+}
+
 void
 slap_queue_csn(
        Operation *op,
@@ -167,13 +209,9 @@ slap_get_csn(
 {
        if ( csn == NULL ) return LDAP_OTHER;
 
-       /* gmtime doesn't always need a mutex, but lutil_csnstr does */
-       ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-       csn->bv_len = lutil_csnstr( csn->bv_val, csn->bv_len, slap_serverID, 0 );
+       csn->bv_len = ldap_pvt_csnstr( csn->bv_val, csn->bv_len, slap_serverID, 0 );
        if ( manage_ctxcsn )
                slap_queue_csn( op, csn );
 
-       ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-
        return LDAP_SUCCESS;
 }