ITS#4565

diff --git a/CHANGES b/CHANGES
index 89c277dd31c8ed84362988191fbb458bb8098a82..91d1d668051fed22d5b2927223ba4b888b183a4d 100644 (file)
--- 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 86f839d9338ad458dc2d8eb15bc9097a2039e219..7002464e096e54ca8f6e543dc42bbdacd1b397d9 100644 (file)
--- 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;