servers/lloadd/main.c

@@ -378,6 +378,8 @@ main( int argc, char **argv )
 
     slap_sl_mem_init();
 
+    (void) ldap_pvt_thread_initialize();
+
     serverName = lutil_progname( "lloadd", argc, argv );
 
 #ifdef HAVE_NT_SERVICE_MANAGER

servers/slapd/daemon.c

@@ -2110,7 +2110,6 @@ slap_listener(
 	struct berval peerbv = BER_BVC(peername);
 #ifdef LDAP_PF_LOCAL_SENDMSG
 	char peerbuf[8];
-	struct berval peerbv = BER_BVNULL;
 #endif
 	int cflag;
 	int tid;

servers/slapd/entry.c

@@ -845,7 +845,8 @@ int entry_decode(EntryHeader *eh, Entry **e)
 	a = x->e_attrs;
 	bptr = (BerVarray)eh->bv.bv_val;
 
-	while ((i = entry_getlen(&ptr))) {
+	while (((char *)ptr - eh->bv.bv_val < eh->bv.bv_len) &&
+	       (i = entry_getlen(&ptr))) {
 		struct berval bv;
 		bv.bv_len = i;
 		bv.bv_val = (char *) ptr;

servers/slapd/overlays/accesslog.c

@@ -1515,7 +1515,7 @@ accesslog_response(Operation *op, SlapReply *rs)
 	Attribute *a, *last_attr;
 	Modifications *m;
 	struct berval *b, uuid = BER_BVNULL;
-	int i;
+	int i, success;
 	int logop;
 	slap_verbmasks *lo;
 	Entry *e = NULL, *old = NULL, *e_uuid = NULL;
@@ -1525,6 +1525,7 @@ accesslog_response(Operation *op, SlapReply *rs)
 	BerVarray vals;
 	Operation op2 = {0};
 	SlapReply rs2 = {REP_RESULT};
+	char csnbuf[LDAP_PVT_CSNSTR_BUFSIZE];
 
 	/* ITS#9051 Make sure we only remove the callback on a final response */
 	if ( rs->sr_type != REP_RESULT && rs->sr_type != REP_EXTENDED &&
@@ -1546,6 +1547,16 @@ accesslog_response(Operation *op, SlapReply *rs)
 	if ( op->o_dont_replicate )
 		goto skip;
 
+	/*
+	 * ITS#9051 Technically LDAP_REFERRAL and LDAP_SASL_BIND_IN_PROGRESS
+	 * are not errors, but they aren't really success either
+	 */
+	success = rs->sr_err == LDAP_SUCCESS ||
+		rs->sr_err == LDAP_COMPARE_TRUE ||
+		rs->sr_err == LDAP_COMPARE_FALSE;
+	if ( li->li_success && !success )
+		goto skip;
+
 	if ( !( li->li_ops & lo->mask ) ) {
 		log_base *lb;
 
@@ -1559,6 +1570,12 @@ accesslog_response(Operation *op, SlapReply *rs)
 			goto skip;
 	}
 
+	op2.o_hdr = op->o_hdr;
+	op2.o_tag = LDAP_REQ_ADD;
+	op2.o_bd = li->li_db;
+	op2.o_csn.bv_val = csnbuf;
+	op2.o_csn.bv_len = sizeof(csnbuf);
+
 	if ( !( lo->mask & LOG_OP_WRITES ) ) {
 		ldap_pvt_thread_mutex_lock( &li->li_op_rmutex );
 	}
@@ -1567,7 +1584,7 @@ accesslog_response(Operation *op, SlapReply *rs)
 		 * Make sure we have a CSN before we release li_op_rmutex to preserve
 		 * ordering
 		 */
-		if ( BER_BVISEMPTY( &op->o_csn ) ) {
+		if ( !success || BER_BVISEMPTY( &op->o_csn ) ) {
 			slap_get_csn( &op2, &op2.o_csn, 1 );
 		} else {
 			if ( !( lo->mask & LOG_OP_WRITES ) ) {
@@ -1588,15 +1605,6 @@ accesslog_response(Operation *op, SlapReply *rs)
 	BER_BVZERO( &li->li_uuid );
 	ldap_pvt_thread_mutex_unlock( &li->li_op_rmutex );
 
-	/*
-	 * ITS#9051 Technically LDAP_REFERRAL and LDAP_SASL_BIND_IN_PROGRESS
-	 * are not errors, but they aren't really success either
-	 */
-	if ( li->li_success && rs->sr_err != LDAP_SUCCESS &&
-			rs->sr_err != LDAP_COMPARE_TRUE &&
-			rs->sr_err != LDAP_COMPARE_FALSE )
-		goto done;
-
 	e = accesslog_entry( op, rs, li, logop, &op2 );
 
 	if ( !BER_BVISNULL( &op->o_req_ndn ))
@@ -1918,9 +1926,6 @@ accesslog_response(Operation *op, SlapReply *rs)
 		}
 	}
 
-	op2.o_hdr = op->o_hdr;
-	op2.o_tag = LDAP_REQ_ADD;
-	op2.o_bd = li->li_db;
 	op2.o_dn = li->li_db->be_rootdn;
 	op2.o_ndn = li->li_db->be_rootndn;
 	op2.o_req_dn = e->e_name;

servers/slapd/schema/README

@@ -7,15 +7,17 @@ collective.schema       Collective attributes (experimental)
 corba.schema            Corba Object
 core.schema             OpenLDAP "core"
 cosine.schema           COSINE Pilot
+dsee.schema             Sun DSEE compatibilty schema for replication
 duaconf.schema          Client Configuration (work in progress)
 dyngroup.schema			Dynamic Group (experimental)
 inetorgperson.schema    InetOrgPerson
 java.schema             Java Object
 misc.schema             Miscellaneous Schema (experimental)
-nadf.schema             North American Directory Forum (obsolete)
+msuser.schema           Microsoft's Active Directory schema for replication
+namedobject.schema      namedObject draft schema (work in progress)
 nis.schema              Network Information Service (experimental)
 openldap.schema         OpenLDAP Project (FYI)
-ppolicy.schema          Password Policy Schema (work in progress)
+pmi.schema              ITU X.509 PMI support (experimental)
 
 Additional "generally useful" schema definitions can be submitted
 using the OpenLDAP Issue Tracking System <http://www.openldap.org/its/>.