#ifdef SLAPD_SCHEMA_NOT_COMPAT
int rc;
const char *text;
- AttributeDescription *ad_distinguishedName = slap_schema.si_ad_distinguishedName;
- AttributeDescription *ad_member = slap_schema.si_ad_member;
-#ifdef SLAPD_ACI_ENABLED
- AttributeDescription *ad_aci = slap_schema.si_ad_aci;
-#endif
-#else
- static char *ad_aci = "aci";
- static char *ad_member = "member";
#endif
a = NULL;
}
- if( b->a_dn_at->ad_type->sat_syntax
- != ad_distinguishedName->ad_type->sat_syntax )
+ if( !is_at_syntax( b->a_dn_at->ad_type,
+ SLAPD_DN_SYNTAX ) )
{
fprintf( stderr,
- "%s: line %d: dnattr \"%s\": inappropriate syntax: %s\n",
+ "%s: line %d: dnattr \"%s\": "
+ "inappropriate syntax: %s\n",
fname, lineno, right,
b->a_dn_at->ad_type->sat_syntax_oid );
acl_usage();
b->a_group_pat = ch_strdup( right );
if (value && *value) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ b->a_group_oc = oc_find( value );
+#else
b->a_group_oc = ch_strdup(value);
+#endif
*--value = '/';
+
+ if( b->a_group_oc == NULL ) {
+ fprintf( stderr,
+ "%s: line %d: group objectclass "
+ "\"%s\" unknown\n",
+ fname, lineno, value );
+ acl_usage();
+ }
} else {
- b->a_group_oc = ch_strdup("groupOfNames");
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ b->a_group_oc = oc_find(SLAPD_GROUP_CLASS);
+
+ if( b->a_group_oc == NULL ) {
+ fprintf( stderr,
+ "%s: line %d: group default objectclass "
+ "\"%s\" unknown\n",
+ fname, lineno, SLAPD_GROUP_CLASS );
+ acl_usage();
+ }
+#else
+ b->a_group_oc = ch_strdup(SLAPD_GROUP_CLASS);
+#endif
}
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+#if 0
+ if( is_object_subclass( b->a_group_oc,
+ slap_schema.si_oc_referral ) )
+ {
+ fprintf( stderr,
+ "%s: line %d: group objectclass \"%s\" "
+ "is subclass of referral\n",
+ fname, lineno, value );
+ acl_usage();
+ }
+
+ if( is_object_subclass( b->a_group_oc,
+ slap_schema.si_oc_alias ) )
+ {
+ fprintf( stderr,
+ "%s: line %d: group objectclass \"%s\" "
+ "is subclass of alias\n",
+ fname, lineno, value );
+ acl_usage();
+ }
+#endif
+#endif
+
if (name && *name) {
#ifdef SLAPD_SCHEMA_NOT_COMPAT
rc = slap_str2ad( right, &b->a_group_at, &text );
fname, lineno, right, text );
acl_usage();
}
-
- if( b->a_group_at->ad_type->sat_syntax
- != ad_member->ad_type->sat_syntax )
- {
- fprintf( stderr,
- "%s: line %d: group \"%s\": inappropriate syntax: %s\n",
- fname, lineno, right,
- b->a_group_at->ad_type->sat_syntax_oid );
- acl_usage();
- }
#else
b->a_group_at = ch_strdup(name);
#endif
*--name = '/';
-
} else {
#ifdef SLAPD_SCHEMA_NOT_COMPAT
- b->a_group_at = ad_dup( ad_member );
+ rc = slap_str2ad( SLAPD_GROUP_ATTR, &b->a_group_at, &text );
+
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr,
+ "%s: line %d: group \"%s\": %s\n",
+ fname, lineno, SLAPD_GROUP_ATTR, text );
+ acl_usage();
+ }
#else
- b->a_group_at = ch_strdup( ad_member );
+ b->a_group_at = ch_strdup( SLAPD_GROUP_ATTR );
#endif
}
#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if( b->a_group_at == NULL ) {
+ if( !is_at_syntax( b->a_group_at->ad_type,
+ SLAPD_DN_SYNTAX ) )
+ {
fprintf( stderr,
- "%s: line %d: group attribute type undefined.\n",
- fname, lineno );
+ "%s: line %d: group \"%s\": inappropriate syntax: %s\n",
+ fname, lineno, right,
+ b->a_group_at->ad_type->sat_syntax_oid );
acl_usage();
}
-#endif /* SLAPD_SCHEMA_NOT_COMPAT */
+
+
+ {
+ int rc;
+ struct berval val;
+ struct berval *vals[2];
+
+ val.bv_val = b->a_group_oc->soc_oid;
+ val.bv_len = strlen(val.bv_val);
+ vals[0] = &val;
+ vals[1] = NULL;
+
+
+ rc = oc_check_allowed( b->a_group_at->ad_type, vals );
+
+ if( rc != 0 ) {
+ fprintf( stderr,
+ "%s: line %d: group: \"%s\" not allowed by \"%s\"\n",
+ fname, lineno,
+ b->a_group_at->ad_type,
+ b->a_group_oc->soc_oid );
+ acl_usage();
+ }
+ }
+#endif
continue;
}
acl_usage();
}
- if( b->a_aci_at->ad_type->sat_syntax
- != ad_aci->ad_type->sat_syntax )
- {
+ } else {
+ rc = slap_str2ad( SLAPD_ACI_ATTR, &b->a_aci_at, &text );
+
+ if( rc != LDAP_SUCCESS ) {
fprintf( stderr,
- "%s: line %d: aci \"%s\": inappropriate syntax: %s\n",
- fname, lineno, right,
- b->a_aci_at->ad_type->sat_syntax_oid );
+ "%s: line %d: aci \"%s\": %s\n",
+ fname, lineno, SLAPD_ACI_ATTR, text );
acl_usage();
}
- } else {
- b->a_aci_at = ad_dup( ad_aci );
}
- if( b->a_aci_at == NULL ) {
+ if( !is_at_syntax( b->a_aci_at->ad_type,
+ SLAPD_ACI_SYNTAX) )
+ {
fprintf( stderr,
- "%s: line %d: aci attribute type undefined.\n",
- fname, lineno );
+ "%s: line %d: aci \"%s\": inappropriate syntax: %s\n",
+ fname, lineno, right,
+ b->a_aci_at->ad_type->sat_syntax_oid );
acl_usage();
}
if ( right != NULL && *right != '\0' ) {
b->a_aci_at = ch_strdup( right );
} else {
- b->a_aci_at = ch_strdup( SLAPD_ACI_DEFAULT_ATTR );
+ b->a_aci_at = ch_strdup( SLAPD_ACI_ATTR );
}
#endif
continue;