From 9316c4eacebd65bef666b8ed664c67f402958049 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 1 Feb 2000 17:53:07 +0000 Subject: [PATCH] ACI attributes should be of ACI syntax. Need to assign OID for experimental syntax. --- servers/slapd/acl.c | 10 +++++----- servers/slapd/aclparse.c | 4 ++-- servers/slapd/slap.h | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c index 7f26e231a9..239bffa572 100644 --- 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 f17628cefd..d7fa597360 100644 --- 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 1e98442799..1351903d8e 100644 --- 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; -- 2.39.5