mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

ACI attributes should be of ACI syntax. Need to assign

Browse Source 
OID for experimental syntax.
This commit is contained in:
Kurt Zeilenga 2000-02-01 17:53:07 +00:00
parent ebca2a2df9
commit 9316c4eace
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servers/slapd/acl.c
View File

@ -35,15 +35,15 @@ static int aci_mask(
regmatch_t *matches, slap_access_t *grant, slap_access_t *deny ); regmatch_t *matches, slap_access_t *grant, slap_access_t *deny );
char *supportedACIMechs[] = { 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.1", /* experimental draft aci family */
"1.3.6.1.4.1.4203.666.7.2", /* experimental OpenLDAP aci family */ "1.3.6.1.4.1.4203.666.7.2", /* experimental OpenLDAP aci family */
NULL NULL
}; };
#endif #endif
static int regex_matches(char *pat, char *str, char *buf, regmatch_t *matches); static int regex_matches(char *pat, char *str, char *buf, regmatch_t *matches);
static void string_expand(char *newbuf, int bufsiz, char *pattern, static void string_expand(char *newbuf, int bufsiz, char *pattern,
char *match, regmatch_t *matches); char *match, regmatch_t *matches);
/* /*

4
servers/slapd/aclparse.c
View File

@ -491,10 +491,10 @@ parse_acl(
} }
if( strcmp( b->a_aci_at->sat_syntax_oid, if( strcmp( b->a_aci_at->sat_syntax_oid,
SLAPD_OID_DN_SYNTAX ) != 0 ) SLAPD_OID_ACI_SYNTAX ) != 0 )
{ {
fprintf( stderr, 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 ); fname, lineno );
acl_usage(); acl_usage();
} }

1
servers/slapd/slap.h
View File

@ -89,6 +89,7 @@ LDAP_BEGIN_DECL
/* schema needed by slapd */ /* schema needed by slapd */
#define SLAPD_OID_DN_SYNTAX "1.3.6.1.4.1.1466.115.121.1.12" #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; LIBSLAPD_F (int) slap_debug;