From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 6 Oct 2006 01:31:19 +0000 (+0000)
Subject: ITS#4565
X-Git-Tag: OPENLDAP_REL_ENG_2_3_28~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e57e1a564e63199d1d4e75022bf7888cad7535a0;p=openldap

ITS#4565
---

diff --git a/CHANGES b/CHANGES
index 89c277dd31..91d1d66805 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.3.28 Engineering
 	Added ldapsearch bad filter pattern check (ITS#4647)
 	Fixed slapd global access controls initialization (ITS#4654)
 	Fixed slapd setting c_sasl_bindop only on SASL binds
+	Fixed slapd return code not being propagated (ITS#4565)
 	Fixed slapd-ldap retry with idassert (ITS#4686)
 	Fixed slapd-monitor locking with scope "subordinate" (ITS#4668)
 	Fixed slapd-perl deletes (ITS#2612)
diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 86f839d933..7002464e09 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -171,6 +171,8 @@ slap_init( int mode, const char *name )
 		if( rc == 0 ) {
 			rc = backend_init( );
 		}
+		if ( rc )
+			return rc;
 
 		break;