From 044b6464459bc710b5a31c4954bdd5387f2f03ba Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 5 Feb 2009 22:59:02 +0000 Subject: [PATCH] Fix prev commit, no recursion allowed in glue_sub_attach --- servers/slapd/backglue.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c index cf53b0b5e3..f8df9b2006 100644 --- a/servers/slapd/backglue.c +++ b/servers/slapd/backglue.c @@ -949,6 +949,7 @@ typedef struct glue_Addrec { /* List of added subordinates */ static glue_Addrec *ga_list; +static int ga_adding; static int glue_db_init( @@ -1087,6 +1088,11 @@ glue_sub_attach( int online ) glue_Addrec *ga, *gnext = NULL; int rc = 0; + if ( ga_adding ) + return 0; + + ga_adding = 1; + /* For all the subordinate backends */ for ( ga=ga_list; ga != NULL; ga = gnext ) { BackendDB *be; @@ -1135,8 +1141,11 @@ glue_sub_attach( int online ) /* allow this for now, assume a superior will * be added later */ - if ( online ) - return 0; + if ( online ) { + rc = 0; + gnext = ga_list; + break; + } rc = LDAP_NO_SUCH_OBJECT; } ch_free( ga ); @@ -1145,6 +1154,8 @@ glue_sub_attach( int online ) ga_list = gnext; + ga_adding = 0; + return rc; } -- 2.39.5