X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=ed8fd6ef79c67a3a9debf83650f2e3750c717ed6;hb=2c94c7915a52f8df4323c8193ec424df568f0fc1;hp=4753d0775866c425b89054515d14fa9c23f6af69;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 4753d07758..ed8fd6ef79 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -204,7 +204,8 @@ at_destroy( void )
 		ldap_pvt_thread_mutex_destroy(&a->sat_ad_mutex);
 		ldap_attributetype_free((LDAPAttributeType *)a);
 	}
-	ad_destroy(slap_schema.si_at_undefined->sat_ad);
+	if ( slap_schema.si_at_undefined )
+		ad_destroy(slap_schema.si_at_undefined->sat_ad);
 }
 
 static int
@@ -273,13 +274,42 @@ at_add(
 	MatchingRule	*mr;
 	Syntax		*syn;
 	int		code;
-	char			*cname;
+	char	*cname;
+	char	*oid;
+
+	if ( !OID_LEADCHAR( at->at_oid[0] )) {
+		/* Expand OID macros */
+		oid = oidm_find( at->at_oid );
+		if ( !oid ) {
+			*err = at->at_oid;
+			return SLAP_SCHERR_OIDM;
+		}
+		if ( oid != at->at_oid ) {
+			ldap_memfree( at->at_oid );
+			at->at_oid = oid;
+		}
+	}
+
+	if ( at->at_syntax_oid && !OID_LEADCHAR( at->at_syntax_oid[0] )) {
+		/* Expand OID macros */
+		oid = oidm_find( at->at_syntax_oid );
+		if ( !oid ) {
+			*err = at->at_syntax_oid;
+			return SLAP_SCHERR_OIDM;
+		}
+		if ( oid != at->at_syntax_oid ) {
+			ldap_memfree( at->at_syntax_oid );
+			at->at_syntax_oid = oid;
+		}
+
+	}
 
 	if ( at->at_names && at->at_names[0] ) {
 		int i;
 
 		for( i=0; at->at_names[i]; i++ ) {
 			if( !slap_valid_descr( at->at_names[i] ) ) {
+				*err = at->at_names[i];
 				return SLAP_SCHERR_BAD_DESCR;
 			}
 		}
@@ -288,12 +318,29 @@ at_add(
 
 	} else if ( at->at_oid ) {
 		cname = at->at_oid;
+
 	} else {
+		*err = "";
 		return SLAP_SCHERR_ATTR_INCOMPLETE;
 	}
 
+	*err = cname;
+
+	if ( !at->at_usage && at->at_no_user_mod ) {
+		/* user attribute must be modifable */
+		return SLAP_SCHERR_ATTR_BAD_USAGE;
+	}
+
 	if ( at->at_collective ) {
-		return SLAP_SCHERR_NOT_SUPPORTED;
+		if( at->at_usage ) {
+			/* collective attributes cannot be operational */
+			return SLAP_SCHERR_NOT_SUPPORTED;
+		}
+
+		if( at->at_single_value ) {
+			/* collective attributes cannot be single-valued */
+			return SLAP_SCHERR_NOT_SUPPORTED;
+		}
 	}
 
 	sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) );
@@ -314,9 +361,13 @@ at_add(
 		sat->sat_sup = supsat;
 
 		if ( at_append_to_list(sat, &supsat->sat_subtypes) ) {
-			*err = cname;
 			return SLAP_SCHERR_OUTOFMEM;
 		}
+
+		if ( sat->sat_usage != supsat->sat_usage ) {
+			/* subtypes must have same usage as their SUP */
+			return SLAP_SCHERR_ATTR_BAD_USAGE;
+		}
 	}
 
 	/*