X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2Flastmod.c;h=fb5bda9651e851200807c1c32b22b72fb7750464;hb=34f4c2cb97dd6c7851e30298c7e014e170f54665;hp=82021ec63a41d6769c09acbd5d6445cdd95e2ef1;hpb=61ee5897e03882d2ed1e6a147f69568e0f12eadb;p=openldap

diff --git a/servers/slapd/overlays/lastmod.c b/servers/slapd/overlays/lastmod.c
index 82021ec63a..fb5bda9651 100644
--- a/servers/slapd/overlays/lastmod.c
+++ b/servers/slapd/overlays/lastmod.c
@@ -1,7 +1,7 @@
 /* lastmod.c - returns last modification info */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,12 +33,14 @@ typedef struct lastmod_info_t {
 	struct berval		lmi_rdnvalue;
 	Entry			*lmi_e;
 	ldap_pvt_thread_mutex_t	lmi_entry_mutex;
+	int			lmi_enabled;
 } lastmod_info_t;
 
 struct lastmod_schema_t {
 	ObjectClass		*lms_oc_lastmod;
 	AttributeDescription	*lms_ad_lastmodDN;
 	AttributeDescription	*lms_ad_lastmodType;
+	AttributeDescription	*lms_ad_lastmodEnabled;
 } lastmod_schema;
 
 enum lastmodType_e {
@@ -78,7 +80,7 @@ static struct m_s {
 			"$ description "
 			"$ seeAlso "
 		") )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
-		offsetof(struct lastmod_schema_t, lms_oc_lastmod) },
+		offsetof( struct lastmod_schema_t, lms_oc_lastmod ) },
 	{ NULL }
 }, mat[] = {
 	{ "lastmodDN", "( 1.3.6.1.4.1.4203.666.1.28"
@@ -88,7 +90,7 @@ static struct m_s {
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
 		"NO-USER-MODIFICATION "
 		"USAGE directoryOperation )", SLAP_AT_HIDE,
-		offsetof(struct lastmod_schema_t, lms_ad_lastmodDN) },
+		offsetof( struct lastmod_schema_t, lms_ad_lastmodDN ) },
 	{ "lastmodType", "( 1.3.6.1.4.1.4203.666.1.29"
 		"NAME 'lastmodType' "
 		"DESC 'Type of last modification' "
@@ -98,12 +100,16 @@ static struct m_s {
 		"NO-USER-MODIFICATION "
 		"USAGE directoryOperation )", SLAP_AT_HIDE,
 		offsetof( struct lastmod_schema_t, lms_ad_lastmodType ) },
+	{ "lastmodEnabled", "( 1.3.6.1.4.1.4203.666.1.30"
+		"NAME 'lastmodEnabled' "
+		"DESC 'Lastmod overlay state' "
+		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 "
+		"EQUALITY booleanMatch "
+		"SINGLE-VALUE )", 0,
+		offsetof( struct lastmod_schema_t, lms_ad_lastmodEnabled ) },
 	{ NULL }
-};
 
-static const struct berval *write_exop[] = {
-	&slap_EXOP_MODIFY_PASSWD,
-	NULL
+	/* FIXME: what about UUID of last modified entry? */
 };
 
 static int
@@ -206,12 +212,78 @@ lastmod_exop( Operation *op, SlapReply *rs )
 	return -1;
 }
 
+static int
+lastmod_modify( Operation *op, SlapReply *rs )
+{
+	slap_overinst		*on = (slap_overinst *)op->o_bd->bd_info;
+	lastmod_info_t		*lmi = (lastmod_info_t *)on->on_bi.bi_private;
+	Modifications		*ml;
+
+	ldap_pvt_thread_mutex_lock( &lmi->lmi_entry_mutex );
+
+	if ( !acl_check_modlist( op, lmi->lmi_e, op->orm_modlist ) ) {
+		rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+		goto cleanup;
+	}
+
+	for ( ml = op->orm_modlist; ml; ml = ml->sml_next ) {
+		Attribute	*a;
+
+		if ( ml->sml_desc != lastmod_schema.lms_ad_lastmodEnabled ) {
+			continue;
+		}
+
+		if ( ml->sml_op != LDAP_MOD_REPLACE ) {
+			rs->sr_text = "unsupported mod type";
+			rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+			goto cleanup;
+		}
+		
+		a = attr_find( lmi->lmi_e->e_attrs, ml->sml_desc );
+
+		if ( a == NULL ) {
+			rs->sr_text = "lastmod overlay internal error";
+			rs->sr_err = LDAP_OTHER;
+			goto cleanup;
+		}
+
+		ch_free( a->a_vals[ 0 ].bv_val );
+		ber_dupbv( &a->a_vals[ 0 ], &ml->sml_values[ 0 ] );
+		if ( a->a_nvals ) {
+			ch_free( a->a_nvals[ 0 ].bv_val );
+			if ( ml->sml_nvalues && !BER_BVISNULL( &ml->sml_nvalues[ 0 ] ) ) {
+				ber_dupbv( &a->a_nvals[ 0 ], &ml->sml_nvalues[ 0 ] );
+			} else {
+				ber_dupbv( &a->a_nvals[ 0 ], &ml->sml_values[ 0 ] );
+			}
+		}
+
+		if ( strcmp( ml->sml_values[ 0 ].bv_val, "TRUE" ) == 0 ) {
+			lmi->lmi_enabled = 1;
+		} else if ( strcmp( ml->sml_values[ 0 ].bv_val, "FALSE" ) == 0 ) {
+			lmi->lmi_enabled = 0;
+		} else {
+			assert( 0 );
+		}
+	}
+
+	rs->sr_err = LDAP_SUCCESS;
+
+cleanup:;
+	ldap_pvt_thread_mutex_unlock( &lmi->lmi_entry_mutex );
+
+	send_ldap_result( op, rs );
+	rs->sr_text = NULL;
+
+	return rs->sr_err;
+}
+
 static int
 lastmod_op_func( Operation *op, SlapReply *rs )
 {
 	slap_overinst		*on = (slap_overinst *)op->o_bd->bd_info;
 	lastmod_info_t		*lmi = (lastmod_info_t *)on->on_bi.bi_private;
-	unsigned		i;
+	Modifications		*ml;
 
 	if ( dn_match( &op->o_req_ndn, &lmi->lmi_e->e_nname ) ) {
 		switch ( op->o_tag ) {
@@ -227,14 +299,27 @@ lastmod_op_func( Operation *op, SlapReply *rs )
 
 		case LDAP_REQ_EXTENDED:
 			/* if write, reject; otherwise process */
-			for ( i = 0; write_exop[ i ] != NULL; i++ ) {
-				if ( ber_bvcmp( write_exop[ i ], &op->oq_extended.rs_reqoid ) == 0 ) {
+			if ( exop_is_write( op )) {
+				rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+				rs->sr_text = "not allowed within namingContext";
+				goto return_error;
+			}
+			return lastmod_exop( op, rs );
+
+		case LDAP_REQ_MODIFY:
+			/* allow only changes to overlay status */
+			for ( ml = op->orm_modlist; ml; ml = ml->sml_next ) {
+				if ( ad_cmp( ml->sml_desc, slap_schema.si_ad_modifiersName ) != 0
+						&& ad_cmp( ml->sml_desc, slap_schema.si_ad_modifyTimestamp ) != 0
+						&& ad_cmp( ml->sml_desc, slap_schema.si_ad_entryCSN ) != 0
+						&& ad_cmp( ml->sml_desc, lastmod_schema.lms_ad_lastmodEnabled ) != 0 )
+				{
 					rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
 					rs->sr_text = "not allowed within namingContext";
 					goto return_error;
 				}
 			}
-			return lastmod_exop( op, rs );
+			return lastmod_modify( op, rs );
 
 		default:
 			rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
@@ -277,40 +362,47 @@ return_error:;
 
 static int
 best_guess( Operation *op,
+		struct berval *bv_entryCSN, struct berval *bv_nentryCSN,
 		struct berval *bv_modifyTimestamp, struct berval *bv_nmodifyTimestamp,
 		struct berval *bv_modifiersName, struct berval *bv_nmodifiersName )
 {
-	struct tm	*tm;
-#ifdef HAVE_GMTIME_R
-	struct tm	tm_buf;
-#endif
-	char		tmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
-	time_t		currtime;
+	if ( bv_entryCSN ) {
+		char		csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
+		struct berval	entryCSN;
+	
+		entryCSN.bv_val = csnbuf;
+		entryCSN.bv_len = sizeof( csnbuf );
+		slap_get_csn( NULL, &entryCSN, 0 );
 
-	/* best guess */
+		ber_dupbv( bv_entryCSN, &entryCSN );
+		ber_dupbv( bv_nentryCSN, &entryCSN );
+	}
+
+	if ( bv_modifyTimestamp ) {
+		char		tmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+		struct berval timestamp;
+		time_t		currtime;
+
+		/* best guess */
 #if 0
-	currtime = slap_get_time();
-#endif
-	/* maybe we better use the time the operation was initiated */
-	currtime = op->o_time;
-
-#ifndef HAVE_GMTIME_R
-	ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-	tm = gmtime( &currtime );
-#else /* HAVE_GMTIME_R */
-	tm = gmtime_r( &currtime, &tm_buf );
-#endif /* HAVE_GMTIME_R */
-	lutil_gentime( tmbuf, sizeof( tmbuf ), tm );
-#ifndef HAVE_GMTIME_R
-	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+		currtime = slap_get_time();
 #endif
+		/* maybe we better use the time the operation was initiated */
+		currtime = op->o_time;
 
-	ber_str2bv( tmbuf, 0, 1, bv_modifyTimestamp );
-	ber_dupbv( bv_nmodifyTimestamp, bv_modifyTimestamp );
+		timestamp.bv_val = tmbuf;
+		timestamp.bv_len = sizeof(tmbuf);
+		slap_timestamp( &currtime, &timestamp );
 
-	/* best guess */
-	ber_dupbv( bv_modifiersName, &op->o_dn );
-	ber_dupbv( bv_nmodifiersName, &op->o_ndn );
+		ber_dupbv( bv_modifyTimestamp, &timestamp );
+		ber_dupbv( bv_nmodifyTimestamp, bv_modifyTimestamp );
+	}
+
+	if ( bv_modifiersName ) {
+		/* best guess */
+		ber_dupbv( bv_modifiersName, &op->o_dn );
+		ber_dupbv( bv_nmodifiersName, &op->o_ndn );
+	}
 
 	return 0;
 }
@@ -322,7 +414,9 @@ lastmod_update( Operation *op, SlapReply *rs )
 	lastmod_info_t		*lmi = (lastmod_info_t *)on->on_bi.bi_private;
 	Attribute		*a;
 	Modifications		*ml = NULL;
-	struct berval		bv_modifyTimestamp = BER_BVNULL,
+	struct berval		bv_entryCSN = BER_BVNULL,
+				bv_nentryCSN = BER_BVNULL,
+				bv_modifyTimestamp = BER_BVNULL,
 				bv_nmodifyTimestamp = BER_BVNULL,
 				bv_modifiersName = BER_BVNULL,
 				bv_nmodifiersName = BER_BVNULL,
@@ -337,10 +431,14 @@ lastmod_update( Operation *op, SlapReply *rs )
 	case LDAP_REQ_ADD:
 		lmt = LASTMOD_ADD;
 		e = op->ora_e;
-		a = attr_find( e->e_attrs, slap_schema.si_ad_modifiersName );
+		a = attr_find( e->e_attrs, slap_schema.si_ad_entryCSN );
 		if ( a != NULL ) {
-			ber_dupbv( &bv_modifiersName, &a->a_vals[0] );
-			ber_dupbv( &bv_nmodifiersName, &a->a_nvals[0] );
+			ber_dupbv( &bv_entryCSN, &a->a_vals[0] );
+			if ( a->a_nvals && !BER_BVISNULL( &a->a_nvals[0] ) ) {
+				ber_dupbv( &bv_nentryCSN, &a->a_nvals[0] );
+			} else {
+				ber_dupbv( &bv_nentryCSN, &a->a_vals[0] );
+			}
 		}
 		a = attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp );
 		if ( a != NULL ) {
@@ -351,6 +449,11 @@ lastmod_update( Operation *op, SlapReply *rs )
 				ber_dupbv( &bv_nmodifyTimestamp, &a->a_vals[0] );
 			}
 		}
+		a = attr_find( e->e_attrs, slap_schema.si_ad_modifiersName );
+		if ( a != NULL ) {
+			ber_dupbv( &bv_modifiersName, &a->a_vals[0] );
+			ber_dupbv( &bv_nmodifiersName, &a->a_nvals[0] );
+		}
 		ber_dupbv( &bv_name, &e->e_name );
 		ber_dupbv( &bv_nname, &e->e_nname );
 		break;
@@ -358,7 +461,8 @@ lastmod_update( Operation *op, SlapReply *rs )
 	case LDAP_REQ_DELETE:
 		lmt = LASTMOD_DELETE;
 
-		best_guess( op, &bv_modifyTimestamp, &bv_nmodifyTimestamp,
+		best_guess( op, &bv_entryCSN, &bv_nentryCSN,
+				&bv_modifyTimestamp, &bv_nmodifyTimestamp,
 				&bv_modifiersName, &bv_nmodifiersName );
 
 		ber_dupbv( &bv_name, &op->o_req_dn );
@@ -370,7 +474,8 @@ lastmod_update( Operation *op, SlapReply *rs )
 
 		/* actually, password change is wrapped around a backend 
 		 * call to modify, so it never shows up as an exop... */
-		best_guess( op, &bv_modifyTimestamp, &bv_nmodifyTimestamp,
+		best_guess( op, &bv_entryCSN, &bv_nentryCSN,
+				&bv_modifyTimestamp, &bv_nmodifyTimestamp,
 				&bv_modifiersName, &bv_nmodifiersName );
 
 		ber_dupbv( &bv_name, &op->o_req_dn );
@@ -379,13 +484,28 @@ lastmod_update( Operation *op, SlapReply *rs )
 
 	case LDAP_REQ_MODIFY:
 		lmt = LASTMOD_MODIFY;
+		rc = 3;
 
 		for ( ml = op->orm_modlist; ml; ml = ml->sml_next ) {
 			if ( ad_cmp( ml->sml_desc , slap_schema.si_ad_modifiersName ) == 0 ) {
 				ber_dupbv( &bv_modifiersName, &ml->sml_values[0] );
 				ber_dupbv( &bv_nmodifiersName, &ml->sml_nvalues[0] );
 
-				if ( !BER_BVISNULL( &bv_modifyTimestamp ) ) {
+				rc--;
+				if ( !rc ) {
+					break;
+				}
+
+			} else if ( ad_cmp( ml->sml_desc, slap_schema.si_ad_entryCSN ) == 0 ) {
+				ber_dupbv( &bv_entryCSN, &ml->sml_values[0] );
+				if ( ml->sml_nvalues && !BER_BVISNULL( &ml->sml_nvalues[0] ) ) {
+					ber_dupbv( &bv_nentryCSN, &ml->sml_nvalues[0] );
+				} else {
+					ber_dupbv( &bv_nentryCSN, &ml->sml_values[0] );
+				}
+
+				rc --;
+				if ( !rc ) {
 					break;
 				}
 
@@ -397,12 +517,26 @@ lastmod_update( Operation *op, SlapReply *rs )
 					ber_dupbv( &bv_nmodifyTimestamp, &ml->sml_values[0] );
 				}
 
-				if ( !BER_BVISNULL( &bv_modifiersName ) ) {
+				rc --;
+				if ( !rc ) {
 					break;
 				}
 			}
 		}
 
+		/* if rooted at global overlay, opattrs are not yet in place */
+		if ( BER_BVISNULL( &bv_modifiersName ) ) {
+			best_guess( op, NULL, NULL, NULL, NULL, &bv_modifiersName, &bv_nmodifiersName );
+		}
+
+		if ( BER_BVISNULL( &bv_entryCSN ) ) {
+			best_guess( op, &bv_entryCSN, &bv_nentryCSN, NULL, NULL, NULL, NULL );
+		}
+
+		if ( BER_BVISNULL( &bv_modifyTimestamp ) ) {
+			best_guess( op, NULL, NULL, &bv_modifyTimestamp, &bv_nmodifyTimestamp, NULL, NULL );
+		}
+
 		ber_dupbv( &bv_name, &op->o_req_dn );
 		ber_dupbv( &bv_nname, &op->o_req_ndn );
 		break;
@@ -437,6 +571,15 @@ lastmod_update( Operation *op, SlapReply *rs )
 					ber_dupbv( &bv_modifiersName, &a->a_vals[0] );
 					ber_dupbv( &bv_nmodifiersName, &a->a_nvals[0] );
 				}
+				a = attr_find( e->e_attrs, slap_schema.si_ad_entryCSN );
+				if ( a != NULL ) {
+					ber_dupbv( &bv_entryCSN, &a->a_vals[0] );
+					if ( a->a_nvals && !BER_BVISNULL( &a->a_nvals[0] ) ) {
+						ber_dupbv( &bv_nentryCSN, &a->a_nvals[0] );
+					} else {
+						ber_dupbv( &bv_nentryCSN, &a->a_vals[0] );
+					}
+				}
 				a = attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp );
 				if ( a != NULL ) {
 					ber_dupbv( &bv_modifyTimestamp, &a->a_vals[0] );
@@ -459,7 +602,8 @@ lastmod_update( Operation *op, SlapReply *rs )
 
 		/* if !bi_entry_get_rw || bi_entry_get_rw failed for any reason... */
 		if ( e == NULL ) {
-			best_guess( op, &bv_modifyTimestamp, &bv_nmodifyTimestamp,
+			best_guess( op, &bv_entryCSN, &bv_nentryCSN,
+					&bv_modifyTimestamp, &bv_nmodifyTimestamp,
 					&bv_modifiersName, &bv_nmodifiersName );
 		}
 
@@ -523,6 +667,19 @@ lastmod_update( Operation *op, SlapReply *rs )
 	ch_free( a->a_nvals[0].bv_val );
 	a->a_nvals[0] = bv_nmodifyTimestamp;
 
+#if 0
+	fprintf( stderr, "### entryCSN: %s %s\n", bv_nentryCSN.bv_val, bv_entryCSN.bv_val );
+#endif
+
+	a = attr_find( lmi->lmi_e->e_attrs, slap_schema.si_ad_entryCSN );
+	if ( a == NULL ) {
+		goto error_return;
+	} 
+	ch_free( a->a_vals[0].bv_val );
+	a->a_vals[0] = bv_entryCSN;
+	ch_free( a->a_nvals[0].bv_val );
+	a->a_nvals[0] = bv_nentryCSN;
+
 	rc = 0;
 
 error_return:;
@@ -534,7 +691,8 @@ error_return:;
 static int
 lastmod_response( Operation *op, SlapReply *rs )
 {
-	unsigned int	i;
+	slap_overinst		*on = (slap_overinst *)op->o_bd->bd_info;
+	lastmod_info_t		*lmi = (lastmod_info_t *)on->on_bi.bi_private;
 
 	/* don't record failed operations */
 	switch ( rs->sr_err ) {
@@ -556,18 +714,22 @@ lastmod_response( Operation *op, SlapReply *rs )
 
 	case LDAP_REQ_EXTENDED:
 		/* if write, process */
-		for ( i = 0; write_exop[ i ] != NULL; i++ ) {
-			if ( ber_bvcmp( write_exop[ i ], &op->oq_extended.rs_reqoid ) == 0 ) {
-				goto process;
-			}
-		}
-		/* fall thru */
+		if ( exop_is_write( op ))
+			break;
 
+		/* fall thru */
 	default:
 		return SLAP_CB_CONTINUE;
 	}
 
-process:;
+	/* skip if disabled */
+	ldap_pvt_thread_mutex_lock( &lmi->lmi_entry_mutex );
+	if ( !lmi->lmi_enabled ) {
+		ldap_pvt_thread_mutex_unlock( &lmi->lmi_entry_mutex );
+		return SLAP_CB_CONTINUE;
+	}
+	ldap_pvt_thread_mutex_unlock( &lmi->lmi_entry_mutex );
+
 	(void)lastmod_update( op, rs );
 
 	return SLAP_CB_CONTINUE;
@@ -595,42 +757,24 @@ lastmod_db_init(
 			at = ldap_str2attributetype( mat[i].schema, &code,
 				&err, LDAP_SCHEMA_ALLOW_ALL );
 			if ( !at ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( OPERATION, CRIT, "lastmod_init: "
-					"in AttributeType '%s' %s before %s\n",
-					mat[i].name, ldap_scherr2str(code), err );
-#else
 				Debug( LDAP_DEBUG_ANY, "lastmod_init: "
 					"in AttributeType '%s' %s before %s\n",
 					mat[i].name, ldap_scherr2str(code), err );
-#endif
 				return -1;
 			}
 	
 			if ( at->at_oid == NULL ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( OPERATION, CRIT, "lastmod_init: "
-					"null OID for attributeType '%s'\n",
-					mat[i].name, 0, 0 );
-#else
 				Debug( LDAP_DEBUG_ANY, "lastmod_init: "
 					"null OID for attributeType '%s'\n",
 					mat[i].name, 0, 0 );
-#endif
 				return -1;
 			}
 	
-			code = at_add(at, &err);
+			code = at_add(at, 0, NULL, &err);
 			if ( code ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( OPERATION, CRIT, "lastmod_init: "
-					"%s in attributeType '%s'\n",
-					scherr2str(code), mat[i].name, 0 );
-#else
 				Debug( LDAP_DEBUG_ANY, "lastmod_init: "
 					"%s in attributeType '%s'\n",
 					scherr2str(code), mat[i].name, 0 );
-#endif
 				return -1;
 			}
 			ldap_memfree(at);
@@ -638,13 +782,8 @@ lastmod_db_init(
 			ad = ((AttributeDescription **)&(((char *)&lastmod_schema)[mat[i].offset]));
 			ad[0] = NULL;
 			if ( slap_str2ad( mat[i].name, ad, &text ) ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( OPERATION, CRIT,
-					"lastmod_init: %s\n", text, 0, 0 );
-#else
 				Debug( LDAP_DEBUG_ANY,
 					"lastmod_init: %s\n", text, 0, 0 );
-#endif
 				return -1;
 			}
 	
@@ -660,44 +799,25 @@ lastmod_db_init(
 			oc = ldap_str2objectclass(moc[i].schema, &code, &err,
 					LDAP_SCHEMA_ALLOW_ALL );
 			if ( !oc ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( OPERATION, CRIT,
-					"unable to parse lastmod objectClass '%s': "
-					"%s before %s\n" , moc[i].name,
-					ldap_scherr2str(code), err );
-#else
 				Debug( LDAP_DEBUG_ANY,
 					"unable to parse lastmod objectClass '%s': "
 					"%s before %s\n" , moc[i].name,
 					ldap_scherr2str(code), err );
-#endif
 				return -1;
 			}
 
 			if ( oc->oc_oid == NULL ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( OPERATION, CRIT,
-					"objectClass '%s' has no OID\n" ,
-					moc[i].name, 0, 0 );
-#else
 				Debug( LDAP_DEBUG_ANY,
 					"objectClass '%s' has no OID\n" ,
 					moc[i].name, 0, 0 );
-#endif
 				return -1;
 			}
 
-			code = oc_add(oc, 0, &err);
+			code = oc_add(oc, 0, NULL, &err);
 			if ( code ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( OPERATION, CRIT,
-					"objectClass '%s': %s \"%s\"\n" ,
-					moc[i].name, scherr2str(code), err );
-#else
 				Debug( LDAP_DEBUG_ANY,
 					"objectClass '%s': %s \"%s\"\n" ,
 					moc[i].name, scherr2str(code), err );
-#endif
 				return -1;
 			}
 	
@@ -705,15 +825,9 @@ lastmod_db_init(
 	
 			Oc = oc_find( moc[i].name );
 			if ( Oc == NULL ) {
-#ifdef NEW_LOGGING
-				LDAP_LOG( OPERATION, CRIT, "lastmod_init: "
-						"unable to find objectClass %s "
-						"(just added)\n", moc[i].name, 0, 0 );
-#else
 				Debug( LDAP_DEBUG_ANY, "lastmod_init: "
 						"unable to find objectClass %s "
 						"(just added)\n", moc[i].name, 0, 0 );
-#endif
 				return -1;
 			}
 
@@ -724,7 +838,10 @@ lastmod_db_init(
 	}
 
 	lmi = (lastmod_info_t *)ch_malloc( sizeof( lastmod_info_t ) );
+
 	memset( lmi, 0, sizeof( lastmod_info_t ) );
+	lmi->lmi_enabled = 1;
+	
 	on->on_bi.bi_private = lmi;
 
 	return 0;
@@ -750,6 +867,17 @@ lastmod_db_config(
 
 		ber_str2bv( argv[ 1 ], 0, 1, &lmi->lmi_rdnvalue );
 
+	} else if ( strcasecmp( argv[ 0 ], "lastmod-enabled" ) == 0 ) {
+		if ( strcasecmp( argv[ 1 ], "yes" ) == 0 ) {
+			lmi->lmi_enabled = 1;
+
+		} else if ( strcasecmp( argv[ 1 ], "no" ) == 0 ) {
+			lmi->lmi_enabled = 0;
+
+		} else {
+			return -1;
+		}
+
 	} else {
 		return SLAP_CONF_UNKNOWN;
 	}
@@ -765,12 +893,12 @@ lastmod_db_open(
 	slap_overinst	*on = (slap_overinst *) be->bd_info;
 	lastmod_info_t	*lmi = (lastmod_info_t *)on->on_bi.bi_private;
 	char		buf[ 8192 ];
-	struct tm		*tms;
-#ifdef HAVE_GMTIME_R
-	struct tm		tm_buf;
-#endif
 	static char		tmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
 
+	char			csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
+	struct berval		entryCSN;
+	struct berval timestamp;
+
 	if ( !SLAP_LASTMOD( be ) ) {
 		fprintf( stderr, "set \"lastmod on\" to make this overlay effective\n" );
 		return -1;
@@ -779,44 +907,46 @@ lastmod_db_open(
 	/*
 	 * Start
 	 */
-#ifndef HAVE_GMTIME_R
-	ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-	tms = gmtime( &starttime );
-#else /* HAVE_GMTIME_R */
-	tms = gmtime_r( &starttime, &tm_buf );
-#endif /* HAVE_GMTIME_R */
-	lutil_gentime( tmbuf, sizeof(tmbuf), tms );
-#ifndef HAVE_GMTIME_R
-	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-#endif
+	timestamp.bv_val = tmbuf;
+	timestamp.bv_len = sizeof(tmbuf);
+	slap_timestamp( &starttime, &timestamp );
+
+	entryCSN.bv_val = csnbuf;
+	entryCSN.bv_len = sizeof( csnbuf );
+	slap_get_csn( NULL, &entryCSN, 0 );
 
 	if ( BER_BVISNULL( &lmi->lmi_rdnvalue ) ) {
 		ber_str2bv( "Lastmod", 0, 1, &lmi->lmi_rdnvalue );
 	}
 
 	snprintf( buf, sizeof( buf ),
-			"dn: cn=%s,%s\n"
+			"dn: cn=%s%s%s\n"
 			"objectClass: %s\n"
 			"structuralObjectClass: %s\n"
 			"cn: %s\n"
 			"description: This object contains the last modification to this database\n"
-			"%s: cn=%s,%s\n"
+			"%s: cn=%s%s%s\n"
+			"%s: %s\n"
 			"%s: %s\n"
 			"createTimestamp: %s\n"
 			"creatorsName: %s\n"
+			"entryCSN: %s\n"
 			"modifyTimestamp: %s\n"
 			"modifiersName: %s\n"
 			"hasSubordinates: FALSE\n",
-			lmi->lmi_rdnvalue.bv_val, be->be_suffix[ 0 ].bv_val,
+			lmi->lmi_rdnvalue.bv_val, BER_BVISEMPTY( &be->be_suffix[ 0 ] ) ? "" : ",", be->be_suffix[ 0 ].bv_val,
 			lastmod_schema.lms_oc_lastmod->soc_cname.bv_val,
 			lastmod_schema.lms_oc_lastmod->soc_cname.bv_val,
 			lmi->lmi_rdnvalue.bv_val,
-			lastmod_schema.lms_ad_lastmodDN->ad_cname.bv_val, lmi->lmi_rdnvalue.bv_val, be->be_suffix[ 0 ].bv_val,
+			lastmod_schema.lms_ad_lastmodDN->ad_cname.bv_val,
+				lmi->lmi_rdnvalue.bv_val, BER_BVISEMPTY( &be->be_suffix[ 0 ] ) ? "" : ",", be->be_suffix[ 0 ].bv_val,
 			lastmod_schema.lms_ad_lastmodType->ad_cname.bv_val, lastmodType[ LASTMOD_ADD ].bv_val,
+			lastmod_schema.lms_ad_lastmodEnabled->ad_cname.bv_val, lmi->lmi_enabled ? "TRUE" : "FALSE",
 			tmbuf,
-			BER_BVISNULL( &be->be_rootdn ) ? "" : be->be_rootdn.bv_val,
+			BER_BVISNULL( &be->be_rootdn ) ? SLAPD_ANONYMOUS : be->be_rootdn.bv_val,
+			entryCSN.bv_val,
 			tmbuf,
-			BER_BVISNULL( &be->be_rootdn ) ? "" : be->be_rootdn.bv_val );
+			BER_BVISNULL( &be->be_rootdn ) ? SLAPD_ANONYMOUS : be->be_rootdn.bv_val );
 
 #if 0
 	fprintf( stderr, "# entry:\n%s\n", buf );
@@ -865,9 +995,8 @@ lastmod_db_destroy(
 static slap_overinst 		lastmod;
 
 int
-lastmod_init()
+lastmod_initialize()
 {
-	memset( &lastmod, 0, sizeof( slap_overinst ) );
 	lastmod.on_bi.bi_type = "lastmod";
 	lastmod.on_bi.bi_db_init = lastmod_db_init;
 	lastmod.on_bi.bi_db_config = lastmod_db_config;
@@ -891,7 +1020,7 @@ lastmod_init()
 int
 init_module( int argc, char *argv[] )
 {
-	return lastmod_init();
+	return lastmod_initialize();
 }
 #endif /* SLAPD_OVER_LASTMOD == SLAPD_MOD_DYNAMIC */