From 196f9866da1c4e82e646a1307af948effa6101c6 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 16 Apr 2010 00:26:06 +0000 Subject: [PATCH] ITS#6520 --- CHANGES | 1 + servers/slapd/aclparse.c | 1 + servers/slapd/slap.h | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 5146347037..6225f1f665 100644 --- 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 b531990e42..e7f0407fd4 100644 --- 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 b814782609..8e37d08949 100644 --- 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 { -- 2.39.5