From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 19 Oct 2003 19:16:21 +0000 (+0000)
Subject: "exact" and "base" are equivalent
X-Git-Tag: OPENLDAP_REL_ENG_2_1_24~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e84ab3a49b259ea5de08ed5ab71274dabdfad93;p=thirdparty%2Fopenldap.git

"exact" and "base" are equivalent
---

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index e22f3263ec..2a9cace1ab 100644
--- 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 ce810884e9..2074683829 100644
--- 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 {