ACI attributes should be of ACI syntax. Need to assign

OID for experimental syntax.

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 7f26e231a9c5de31d5348a0c94b6c80fa1e0137e..239bffa5720aaf11190d088cd2f119e5f9978704 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -35,15 +35,15 @@ static int aci_mask(
        regmatch_t *matches, slap_access_t *grant, slap_access_t *deny );
 
 char *supportedACIMechs[] = {
-                               "1.3.6.1.4.1.4203.666.7.1",     /* experimental draft aci family */
-                               "1.3.6.1.4.1.4203.666.7.2",     /* experimental OpenLDAP aci family */
-                               NULL
-               };
+       "1.3.6.1.4.1.4203.666.7.1",     /* experimental draft aci family */
+       "1.3.6.1.4.1.4203.666.7.2",     /* experimental OpenLDAP aci family */
+       NULL
+};
 #endif
 
 static int     regex_matches(char *pat, char *str, char *buf, regmatch_t *matches);
 static void    string_expand(char *newbuf, int bufsiz, char *pattern,
-                             char *match, regmatch_t *matches);
+       char *match, regmatch_t *matches);
 
 
 /*

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index f17628cefd13312cc4edb9af5772edc13b3e3d19..d7fa597360efdc1cf85ed4ba24a86ac6beb1e677 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -491,10 +491,10 @@ parse_acl(
                                        }
 
                                        if( strcmp( b->a_aci_at->sat_syntax_oid,
-                                               SLAPD_OID_DN_SYNTAX ) != 0 )
+                                               SLAPD_OID_ACI_SYNTAX ) != 0 )
                                        {
                                                fprintf( stderr,
-                                                       "%s: line %d: aci attribute type not of DN syntax.\n",
+                                                       "%s: line %d: aci attribute type not of ACI syntax.\n",
                                                        fname, lineno );
                                                acl_usage();
                                        }

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 1e98442799964c1d2e55ef5fbf26290984eb7c8e..1351903d8e2733baade8bfc014dcd384e4f7b7b6 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -89,6 +89,7 @@ LDAP_BEGIN_DECL
 
 /* schema needed by slapd */
 #define SLAPD_OID_DN_SYNTAX "1.3.6.1.4.1.1466.115.121.1.12"
+#define SLAPD_OID_ACI_SYNTAX "1.1.1" /* bogus */
 
 LIBSLAPD_F (int) slap_debug;