ITS#6520

diff --git a/CHANGES b/CHANGES
index 514634703780a59a8e49990c8c4ae347ae8ef7ee..6225f1f6652714666b030bd04d79b4135ae92084 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ OpenLDAP 2.4.22 Engineering
        Fixed libldap GnuTLS serial length (ITS#6460)
        Fixed libldap MozNSS context and PEM support (ITS#6432)
        Fixed slapd acl non-entry internal searches (ITS#6481)
+       Fixed slapd acl attrval style initialization (ITS#6520)
        Fixed slapd certificateListValidate (ITS#6466)
        Fixed slapd empty URI parsing (ITS#6465)
        Fixed slapd glued misplaced entries (ITS#6506)

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index b531990e42a7fc1833b29d514932119346e60eef..e7f0407fd40af2fd191084c072dba2b3e4338b23 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -344,6 +344,7 @@ parse_acl(
                                goto fail;
                        }
                        a = (AccessControl *) ch_calloc( 1, sizeof(AccessControl) );
+                       a->acl_attrval_style = ACL_STYLE_NONE;
                        for ( ++i; i < argc; i++ ) {
                                if ( strcasecmp( argv[i], "by" ) == 0 ) {
                                        i--;

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index b8147826091f9aca6b555614c25e590d7644aa26..8e37d089490b789e2d13f853d73b42753ed00dc5 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1285,7 +1285,9 @@ typedef enum slap_style_e {
        ACL_STYLE_SELF,
        ACL_STYLE_IP,
        ACL_STYLE_IPV6,
-       ACL_STYLE_PATH
+       ACL_STYLE_PATH,
+
+       ACL_STYLE_NONE
 } slap_style_t;
 
 typedef struct AuthorizationInformation {