Revert previous commit

[openldap] / servers / slapd / at.c

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 29cc14df25152151f9cd77fe1b05cc92ddf8b6ac..911c46f8702d5a993233951d8e443d1abbd2d1c8 100644 (file)
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -235,7 +235,7 @@ at_insert(
                                 (AVL_DUP) avl_dup_error ) ) {
                        *err = sat->sat_oid;
                        ldap_memfree(air);
-                       return SLAP_SCHERR_DUP_ATTR;
+                       return SLAP_SCHERR_ATTR_DUP;
                }
                /* FIX: temporal consistency check */
                at_bvfind(&air->air_name);
@@ -253,7 +253,7 @@ at_insert(
                                         (AVL_DUP) avl_dup_error ) ) {
                                *err = *names;
                                ldap_memfree(air);
-                               return SLAP_SCHERR_DUP_ATTR;
+                               return SLAP_SCHERR_ATTR_DUP;
                        }
                        /* FIX: temporal consistency check */
                        at_bvfind(&air->air_name);
@@ -274,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;
                        }
                }
@@ -289,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_ATTR_BAD_USAGE;
+               }
+
+               if( at->at_single_value ) {
+                       /* collective attributes cannot be single-valued */
+                       return SLAP_SCHERR_ATTR_BAD_USAGE;
+               }
        }
 
        sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) );
@@ -315,9 +361,18 @@ 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;
+               }
+
+               if ( sat->sat_flags & SLAP_AT_FINAL ) {
+                       /* cannot subtype a "final" attribute type */
+                       return SLAP_SCHERR_ATTR_BAD_SUP;
+               }
        }
 
        /*
@@ -414,6 +469,9 @@ at_schema_info( Entry *e )
                if ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) {
                        return -1;
                }
+
+               if( at->sat_flags & SLAP_AT_HIDE ) continue;
+
 #if 0
                Debug( LDAP_DEBUG_TRACE, "Merging at [%ld] %s\n",
                       (long) vals[0].bv_len, vals[0].bv_val, 0 );