From: Howard Chu <hyc@openldap.org>
Date: Sat, 15 Dec 2007 01:34:39 +0000 (+0000)
Subject: ITS#5284 fix overlay order
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~306
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=591931279654f9ea77be6825f09d78efd0e1866b;p=openldap

ITS#5284 fix overlay order
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 10fec37525..e394c3d787 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -797,6 +797,11 @@ typedef struct ServerID {
 
 static ServerID *sid_list;
 
+typedef struct voidList {
+	struct voidList *vl_next;
+	void *vl_ptr;
+} voidList;
+
 typedef struct ADlist {
 	struct ADlist *al_next;
 	AttributeDescription *al_desc;
@@ -5759,8 +5764,19 @@ config_back_db_open( BackendDB *be, ConfigReply *cr )
 			slap_overinst *on;
 			Entry *oe;
 			int j;
-
-			for (j=0,on=oi->oi_list; on; j++,on=on->on_next) {
+			voidList *vl, *v0 = NULL;
+
+			/* overlays are in LIFO order, must reverse stack */
+			for (on=oi->oi_list; on; on=on->on_next) {
+				vl = ch_malloc( sizeof( voidList ));
+				vl->vl_next = v0;
+				v0 = vl;
+				vl->vl_ptr = on;
+			}
+			for (j=0; vl; j++,vl=v0) {
+				on = vl->vl_ptr;
+				v0 = vl->vl_next;
+				ch_free( vl );
 				if ( on->on_bi.bi_db_config && !on->on_bi.bi_cf_ocs ) {
 					Debug( LDAP_DEBUG_ANY,
 						"WARNING: No dynamic config support for overlay %s.\n",