ITS#5352

diff --git a/CHANGES b/CHANGES
index 2f7a2bf5e989c2bf108bb960d404452a60be3283..41cb6035c921f7267f9397e26ccf8d021fe6b10c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@ OpenLDAP 2.4.8 Engineering
        Fixed slapd NULL set values (ITS#5286)
        Fixed slapd segv with SASL/OTP (ITS#5259)
        Fixed slapd cn=config crash on delete (ITS#5343)
+       Fixed slapd cn=config global acls (ITS#5352)
        Fixed slapd str2entry with no attrs (ITS#5308)
        Fixed slapd-bdb segv with bdb4.6 (ITS#5322)
        Fixed slapd-bdb modrdn to same dn (ITS#5319)

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 1a265594caec4cfa41f764be8212d0a5f388a41e..0be46d6b607ff693003323ab09d1b5a3d97f27d6 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -940,7 +940,12 @@ config_generic(ConfigArgs *c) {
                        AccessControl *a;
                        char *src, *dst, ibuf[11];
                        struct berval bv, abv;
-                       for (i=0, a=c->be->be_acl; a; i++,a=a->acl_next) {
+                       AccessControl *end;
+                       if ( c->be == frontendDB )
+                               end = NULL;
+                       else
+                               end = frontendDB->be_acl;
+                       for (i=0, a=c->be->be_acl; a && a != end; i++,a=a->acl_next) {
                                abv.bv_len = snprintf( ibuf, sizeof( ibuf ), SLAP_X_ORDERED_FMT, i );
                                if ( abv.bv_len >= sizeof( ibuf ) ) {
                                        ber_bvarray_free_x( c->rvalue_vals, NULL );