ITS#5649

diff --git a/CHANGES b/CHANGES
index 08835ee6aae4e314ed3502205a6accb5237b1d1f..bbf2c9a3145eb73d5f0b7cadadbd84be3934e7f8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.4.12 Engineering
        Fixed liblutil executables on Windows (ITS#5604)
        Fixed slapd custom attribute inheritance (ITS#5642)
        Fixed slapd firstComponentMatch normalization (ITS#5634)
+       Fixed slapd overlay control registration (ITS#5649)
        Fixed slapd socket closing on Windows (ITS#5606)
        Fixed slapd-ldap,slapd-meta invalid filter behavior (ITS#5614)
        Fixed slapd-meta quarantine behavior (ITS#5592)

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 2f23fb0d19dbe0de3181fb024a720ed55f68c1a9..ce69388fa17f5ada292fe2ba1d91e49e6238aabf 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -1063,7 +1063,7 @@ overlay_register_control( BackendDB *be, const char *oid )
                
                /* add to all backends... */
                LDAP_STAILQ_FOREACH( bd, &backendDB, be_next ) {
-                       if ( be == bd ) {
+                       if ( bd == be->bd_self ) {
                                gotit = 1;
                        }
 
@@ -1074,8 +1074,8 @@ overlay_register_control( BackendDB *be, const char *oid )
        }
        
        if ( !gotit ) {
-               be->be_ctrls[ cid ] = 1;
-               be->be_ctrls[ SLAP_MAX_CIDS ] = 1;
+               be->bd_self->be_ctrls[ cid ] = 1;
+               be->bd_self->be_ctrls[ SLAP_MAX_CIDS ] = 1;
        }
 
        return 0;