Revert ITS#3353 patch, it needs to be reworked.

servers/slapd/add.c

@@ -203,14 +203,14 @@ fe_op_add( Operation *op, SlapReply *rs )
 	 */
 	op->o_bd = select_backend( &e->e_nname, manageDSAit, 0 );
 	if ( op->o_bd == NULL ) {
-		rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+		rs->sr_ref = referral_rewrite( default_referral,
 			NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
-		if ( !rs->sr_ref ) rs->sr_ref = SLAPD_GLOBAL(default_referral);
+		if ( !rs->sr_ref ) rs->sr_ref = default_referral;
 		if ( rs->sr_ref ) {
 			rs->sr_err = LDAP_REFERRAL;
 			send_ldap_result( op, rs );
 
-			if ( rs->sr_ref != SLAPD_GLOBAL(default_referral) ) {
+			if ( rs->sr_ref != default_referral ) {
 				ber_bvarray_free( rs->sr_ref );
 			}
 		} else {
@@ -329,17 +329,17 @@ fe_op_add( Operation *op, SlapReply *rs )
 #endif /* LDAP_SLAPI */
 
 			defref = op->o_bd->be_update_refs
-				? op->o_bd->be_update_refs : SLAPD_GLOBAL(default_referral);
+				? op->o_bd->be_update_refs : default_referral;
 
 			if ( defref != NULL ) {
 				rs->sr_ref = referral_rewrite( defref,
 					NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
 				if ( rs->sr_ref == NULL ) rs->sr_ref = defref;
 				rs->sr_err = LDAP_REFERRAL;
-				if (!rs->sr_ref) rs->sr_ref = SLAPD_GLOBAL(default_referral);
+				if (!rs->sr_ref) rs->sr_ref = default_referral;
 				send_ldap_result( op, rs );
 
-				if ( rs->sr_ref != SLAPD_GLOBAL(default_referral) ) {
+				if ( rs->sr_ref != default_referral ) {
 					ber_bvarray_free( rs->sr_ref );
 				}
 			} else {

servers/slapd/back-bdb/cache.c

@@ -1166,7 +1166,7 @@ bdb_txn_get( Operation *op, DB_ENV *env, DB_TXN **txn )
 
 	if ( ldap_pvt_thread_pool_getkey( ctx, ((char *)env)+1, &data, NULL ) ) {
 		for ( i=0, rc=1; rc != 0 && i<4; i++ ) {
-			rc = TXN_BEGIN( env, NULL, txn, 0 );
+			rc = TXN_BEGIN( env, NULL, txn, DB_TXN_NOT_DURABLE );
 			if (rc) ldap_pvt_thread_yield();
 		}
 		if ( rc != 0) {

servers/slapd/back-bdb/compare.c

@@ -74,7 +74,7 @@ dn2entry_retry:
 			e = NULL;
 
 		} else {
-			rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+			rs->sr_ref = referral_rewrite( default_referral,
 				NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
 		}
 

servers/slapd/back-bdb/delete.c

@@ -165,7 +165,7 @@ retry:	/* transaction retry */
 					ber_bvarray_add( &deref, &tmpbv );
 				}
 			} else {
-				deref = SLAPD_GLOBAL(default_referral);
+				deref = default_referral;
 			}
 			rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
 					LDAP_SCOPE_DEFAULT );
@@ -174,10 +174,10 @@ retry:	/* transaction retry */
 		rs->sr_err = LDAP_REFERRAL;
 		send_ldap_result( op, rs );
 
-		if ( rs->sr_ref != SLAPD_GLOBAL(default_referral) ) {
+		if ( rs->sr_ref != default_referral ) {
 			ber_bvarray_free( rs->sr_ref );
 		}
-		if ( deref != SLAPD_GLOBAL(default_referral) ) {
+		if ( deref != default_referral ) {
 			ber_bvarray_free( deref );
 		}
 		free( (char *)rs->sr_matched );

servers/slapd/back-bdb/init.c

@@ -177,7 +177,7 @@ bdb_db_open( BackendDB *be )
 	bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
 
 	/* One long-lived TXN per thread, two TXNs per write op */
-	bdb->bi_dbenv->set_tx_max( bdb->bi_dbenv, SLAPD_GLOBAL(connection_pool_max) * 3 );
+	bdb->bi_dbenv->set_tx_max( bdb->bi_dbenv, connection_pool_max * 3 );
 
 	if ( bdb->bi_idl_cache_max_size ) {
 		bdb->bi_idl_tree = NULL;

servers/slapd/back-bdb/modify.c

@@ -399,7 +399,7 @@ retry:	/* transaction retry */
 					ber_bvarray_add( &deref, &tmpbv );
                 }
 			} else {
-				deref = SLAPD_GLOBAL(default_referral);
+				deref = default_referral;
 			}
 			rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
 					LDAP_SCOPE_DEFAULT );
@@ -408,10 +408,10 @@ retry:	/* transaction retry */
 		rs->sr_err = LDAP_REFERRAL;
 		send_ldap_result( op, rs );
 
-		if ( rs->sr_ref != SLAPD_GLOBAL(default_referral) ) {
+		if ( rs->sr_ref != default_referral ) {
 			ber_bvarray_free( rs->sr_ref );
 		}
-		if ( deref != SLAPD_GLOBAL(default_referral) ) {
+		if ( deref != default_referral ) {
 			ber_bvarray_free( deref );
 		}
 		free( (char *)rs->sr_matched );

servers/slapd/back-bdb/modrdn.c

@@ -188,7 +188,7 @@ retry:	/* transaction retry */
 					ber_bvarray_add( &deref, &tmpbv );
                 }
 			} else {
-				deref = SLAPD_GLOBAL(default_referral);
+				deref = default_referral;
 			}
 			rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
 					LDAP_SCOPE_DEFAULT );
@@ -198,7 +198,7 @@ retry:	/* transaction retry */
 		send_ldap_result( op, rs );
 
 		ber_bvarray_free( rs->sr_ref );
-		if ( deref != SLAPD_GLOBAL(default_referral) ) {
+		if ( deref != default_referral ) {
 			ber_bvarray_free( deref );
 		}
 		free( (char *)rs->sr_matched );

servers/slapd/back-bdb/referral.c

@@ -94,9 +94,9 @@ dn2entry_retry:
 
 			bdb_cache_return_entry_r (bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
 			e = NULL;
-		} else if ( SLAPD_GLOBAL(default_referral) != NULL ) {
+		} else if ( default_referral != NULL ) {
 			rc = LDAP_OTHER;
-			rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+			rs->sr_ref = referral_rewrite( default_referral,
 				NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
 		}
 

servers/slapd/back-bdb/search.c

@@ -612,7 +612,7 @@ dn2entry_retry:
 			}
 
 		} else {
-			rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+			rs->sr_ref = referral_rewrite( default_referral,
 				NULL, &sop->o_req_dn, sop->oq_search.rs_scope );
 		}
 

servers/slapd/back-dnssrv/referral.c

@@ -57,7 +57,7 @@ dnssrv_back_referrals(
 
 	if( ldap_dn2domain( op->o_req_dn.bv_val, &domain ) || domain == NULL ) {
 		rs->sr_err = LDAP_REFERRAL;
-		rs->sr_ref = SLAPD_GLOBAL(default_referral);
+		rs->sr_ref = default_referral;
 		send_ldap_result( op, rs );
 		return LDAP_REFERRAL;
 	}

servers/slapd/back-dnssrv/search.c

@@ -59,7 +59,7 @@ dnssrv_back_search(
 
 	if( ldap_dn2domain( op->o_req_dn.bv_val, &domain ) || domain == NULL ) {
 		rs->sr_err = LDAP_REFERRAL;
-		rs->sr_ref = SLAPD_GLOBAL(default_referral);
+		rs->sr_ref = default_referral;
 		send_ldap_result( op, rs );
 		rs->sr_ref = NULL;
 		goto done;

servers/slapd/back-ldap/init.c

@@ -46,12 +46,12 @@ int init_module(int argc, char *argv[]) {
 
 #endif /* SLAPD_LDAP */
 
-int
+static int
 ldap_back_open(
 	BackendInfo *bi
 )
 {
-	bi->bi_controls = SLAPD_GLOBAL(known_controls);
+	bi->bi_controls = slap_known_controls;
 	return 0;
 }
 

servers/slapd/back-ldbm/add.c

@@ -109,7 +109,7 @@ ldbm_back_add(
 				cache_return_entry_r( &li->li_cache, matched );
 
 			} else {
-				rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+				rs->sr_ref = referral_rewrite( default_referral,
 					NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
 			}
 

servers/slapd/back-ldbm/compare.c

@@ -48,7 +48,7 @@ ldbm_back_compare(
 				: NULL;
 			cache_return_entry_r( &li->li_cache, matched );
 		} else {
-			rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+			rs->sr_ref = referral_rewrite( default_referral,
 				NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
 		}
 

servers/slapd/back-ldbm/dbcache.c

@@ -333,7 +333,7 @@ ldbm_cache_sync_daemon(
 
 		sleep( li->li_dbsyncfreq );
 
-		while (i && ldap_pvt_thread_pool_backload(&SLAPD_GLOBAL(connection_pool)) != 0) {
+		while (i && ldap_pvt_thread_pool_backload(&connection_pool) != 0) {
 			Debug( LDAP_DEBUG_TRACE, "delay syncing %s\n", li->li_directory, 0, 0 );
 			sleep(li->li_dbsyncwaitinterval);
 			i--;

servers/slapd/back-ldbm/delete.c

@@ -70,7 +70,7 @@ ldbm_back_delete(
 					ber_bvarray_add( &deref, &tmpbv );
 				}
 			} else {
-				deref = SLAPD_GLOBAL(default_referral);
+				deref = default_referral;
 			}
 			rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
 							LDAP_SCOPE_DEFAULT );
@@ -82,7 +82,7 @@ ldbm_back_delete(
 		send_ldap_result( op, rs );
 
 		if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
-		if ( deref != SLAPD_GLOBAL(default_referral) ) {
+		if ( deref != default_referral ) {
 			ber_bvarray_free( deref );
 		}
 		free( (char *)rs->sr_matched );

servers/slapd/back-ldbm/id2entry.c

@@ -61,7 +61,7 @@ id2entry_add( Backend *be, Entry *e )
 #endif
 	key.dsize = sizeof(ID);
 
-	ldap_pvt_thread_mutex_lock( &SLAPD_GLOBAL(entry2str_mutex) );
+	ldap_pvt_thread_mutex_lock( &entry2str_mutex );
 	data.dptr = entry2str( e, &len );
 	data.dsize = len + 1;
 
@@ -69,7 +69,7 @@ id2entry_add( Backend *be, Entry *e )
 	flags = LDBM_REPLACE;
 	rc = ldbm_cache_store( db, key, data, flags );
 
-	ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(entry2str_mutex) );
+	ldap_pvt_thread_mutex_unlock( &entry2str_mutex );
 
 	ldbm_cache_close( be, db );
 

servers/slapd/back-ldbm/modify.c

@@ -265,7 +265,7 @@ ldbm_back_modify(
 					ber_bvarray_add( &deref, &tmpbv );
 				}
 			} else {
-				deref = SLAPD_GLOBAL(default_referral);
+				deref = default_referral;
 			}
 			rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
 						LDAP_SCOPE_DEFAULT );
@@ -276,7 +276,7 @@ ldbm_back_modify(
 		send_ldap_result( op, rs );
 
 		if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
-		if ( deref != SLAPD_GLOBAL(default_referral) ) {
+		if ( deref != default_referral ) {
 			ber_bvarray_free( deref );
 		}
 		free( (char *)rs->sr_matched );

servers/slapd/back-ldbm/modrdn.c

@@ -93,7 +93,7 @@ ldbm_back_modrdn(
 					ber_bvarray_add( &deref, &tmpbv );
 				}
 			} else {
-				deref = SLAPD_GLOBAL(default_referral);
+				deref = default_referral;
 			}
 			rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
 						LDAP_SCOPE_DEFAULT );
@@ -105,7 +105,7 @@ ldbm_back_modrdn(
 		send_ldap_result( op, rs );
 
 		if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
-		if ( deref != SLAPD_GLOBAL(default_referral) ) {
+		if ( deref != default_referral ) {
 			ber_bvarray_free( deref );
 		}
 		free( (char *)rs->sr_matched );

servers/slapd/back-ldbm/referral.c

@@ -62,9 +62,9 @@ ldbm_back_referrals(
 
 			cache_return_entry_r( &li->li_cache, matched );
 
-		} else if ( SLAPD_GLOBAL(default_referral) != NULL ) {
+		} else if ( default_referral != NULL ) {
 			rs->sr_err = LDAP_OTHER;
-			rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+			rs->sr_ref = referral_rewrite( default_referral,
 				NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
 		}