upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 01:59:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve syntax errors created by previous -DSLAPD_SCHEMA_COMPAT work.

Browse source
This commit is contained in:
Kurt Zeilenga 2000-01-29 07:00:39 +00:00
parent 02a604db21
commit d8d19d4ff9
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
servers/slapd/aclparse.c
View file

@ -476,21 +476,19 @@ parse_acl(
acl_usage();
}
#ifdef SLAPD_SCHEMA_COMPAT
if ( right != NULL && *right != '\0' ) {
#ifdef SLAPD_SCHEMA_COMPAT
b->a_aci_at = ch_strdup( right );
#else
b->a_aci_at = at_find( right );
#endif
} else {
#ifdef SLAPD_SCHEMA_COMPAT
b->a_aci_at = ch_strdup( SLAPD_ACI_DEFAULT_ATTR );
}
#else
if ( right != NULL && *right != '\0' ) {
b->a_aci_at = at_find( right );
} else {
b->a_aci_at = at_find( SLAPD_ACI_DEFAULT_ATTR );
#endif
}
#ifdef SLAPD_SCHEMA_COMPAT
if( b->a_aci_at == NULL ) {
fprintf( stderr,
"%s: line %d: aci attribute type undefined.\n",
@ -498,7 +496,6 @@ parse_acl(
acl_usage();
}
#ifdef SLAPD_OID_DN_SYNTAX
if( strcmp( b->a_aci_at->sat_syntax_oid,
SLAPD_OID_DN_SYNTAX ) != 0 )
{
@ -507,8 +504,7 @@ parse_acl(
fname, lineno );
acl_usage();
}
#endif /* SLAPD_OID_DN_SYNTAX */
#endif /* SLAPD_SCHEMA_COMPAT */
#endif
continue;
}
#endif /* SLAPD_ACI_ENABLED */