"exact" and "base" are equivalent

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index e22f3263ec5a715c7550dc5f20dc42c43942534c..2a9cace1abc7255bc453fb8e5d45c563619ea47b 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -179,7 +179,9 @@ parse_acl(
                                                } else {
                                                        acl_regex_normalized_dn( right, &a->acl_dn_pat );
                                                }
-                                       } else if ( strcasecmp( style, "base" ) == 0 ) {
+                                       } else if ( strcasecmp( style, "base" ) == 0
+                                               || strcasecmp( style, "exact" ) == 0 )
+                                       {
                                                a->acl_dn_style = ACL_STYLE_BASE;
                                                ber_str2bv( right, 0, 1, &a->acl_dn_pat );
                                        } else if ( strcasecmp( style, "one" ) == 0 ) {
@@ -301,9 +303,9 @@ parse_acl(
                                        || strcasecmp( style, "regex" ) == 0 )
                                {
                                        sty = ACL_STYLE_REGEX;
-                               } else if ( strcasecmp( style, "exact" ) == 0 ) {
-                                       sty = ACL_STYLE_EXACT;
-                               } else if ( strcasecmp( style, "base" ) == 0 ) {
+                               } else if ( strcasecmp( style, "exact" ) == 0 ||
+                                       strcasecmp( style, "base" ) == 0 )
+                               {
                                        sty = ACL_STYLE_BASE;
                                } else if ( strcasecmp( style, "one" ) == 0 ) {
                                        sty = ACL_STYLE_ONE;

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index ce810884e9106e700022c04a5454fa4d7a39c907..2074683829cb607427e5129e7f1572e26cb41069 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -982,9 +982,6 @@ typedef enum slap_style_e {
        ACL_STYLE_SUBTREE,
        ACL_STYLE_CHILDREN,
        ACL_STYLE_ATTROF,
-
-       /* alternate names */
-       ACL_STYLE_EXACT = ACL_STYLE_BASE
 } slap_style_t;
 
 typedef struct slap_authz_info {