Apply acl group extended parse fix.

diff --git a/CHANGES b/CHANGES
index 21fda118fdfd3df1e3281e5f1c40a35134579e9d..a786da3db61323fdacaa648d71025994407e2669 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ Changes included in OpenLDAP 1.2 Release Engineering
        Fixed ldbm Berkeley DB 2.4 mp_pool init problem
        Fixed slapd modrdn
        Fixed slapd command line usage and log level option
+       Fixed slapd acl group extended format parsing (ITS#123)
        Fixed slurpd ldap_pvt_thread_create argument typo
        Added modrdn test.
        Build environment

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index d3cf307e35e92a81af595928a8706439423953c3..05a24cb7721a8ef154894a86ad92a46aaec2236a 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -204,14 +204,14 @@ parse_acl(
                                b->a_dnattr = ch_strdup( right );
 
 #ifdef SLAPD_ACLGROUPS
-                       } else if ( strcasecmp( left, "group" ) == 0 ) {
+                       } else if ( strncasecmp( left, "group", sizeof("group")-1 ) == 0 ) {
                                 char *name = NULL;
                                 char *value = NULL;
                                regtest(fname, lineno, right);
 
                                 /* format of string is "group/objectClassValue/groupAttrName"
                                  */
-                                if ((value = strchr(right, '/')) != NULL) {
+                                if ((value = strchr(left, '/')) != NULL) {
                                         *value++ = '\0';
                                         if (value && *value && (name = strchr(value, '/')) != NULL) 
                                             *name++ = '\0';