Updated for schemas.

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index dd36a7ea0f52d1ea98ab9e06a23f05d081fe13b3..dff429ded9a358e068cdca3db1ba3814cb09020b 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -121,7 +121,6 @@ attr_normalize( char *s )
 }
 #endif
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
 /*
  * attr_merge_fast - merge the given type and value with the list of
  * attributes in attrs. called from str2entry(), where we can make some
@@ -130,6 +129,9 @@ attr_normalize( char *s )
  *             -1      trouble
  */
 
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+       /* not used */
+#else
 int
 attr_merge_fast(
     Entry              *e,
@@ -143,23 +145,17 @@ attr_merge_fast(
 {
        if ( *a == NULL ) {
                for ( *a = &e->e_attrs; **a != NULL; *a = &(**a)->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-                       /* not yet implemented */
-#else
                        if ( strcasecmp( (**a)->a_type, type ) == 0 ) {
                                break;
                        }
-#endif
                }
        }
 
        if ( **a == NULL ) {
                **a = (Attribute *) ch_malloc( sizeof(Attribute) );
                (**a)->a_vals = NULL;
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
                (**a)->a_type = attr_normalize( ch_strdup( type ) );
                (**a)->a_syntax = attr_syntax( type );
-#endif
                (**a)->a_next = NULL;
        }
 
@@ -168,6 +164,7 @@ attr_merge_fast(
 }
 #endif
 
+
 /*
  * attr_merge - merge the given type and value with the list of
  * attributes in attrs.
@@ -178,25 +175,30 @@ attr_merge_fast(
 int
 attr_merge(
     Entry              *e,
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+       AttributeDescription *desc,
+#else
     const char         *type,
+#endif
     struct berval      **vals )
 {
        Attribute       **a;
 
        for ( a = &e->e_attrs; *a != NULL; a = &(*a)->a_next ) {
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-               /* not yet implemented */
+               if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
 #else
-               if ( strcasecmp( (*a)->a_type, type ) == 0 ) {
+               if ( strcasecmp( (*a)->a_type, type ) == 0 )
+#endif
+               {
                        break;
                }
-#endif
        }
 
        if ( *a == NULL ) {
                *a = (Attribute *) ch_malloc( sizeof(Attribute) );
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-               /* not yet implemented */
+               (*a)->a_desc = ad_dup( desc );
 #else
                (*a)->a_type = attr_normalize( ch_strdup( type ) );
                (*a)->a_syntax = attr_syntax( type );
@@ -221,7 +223,7 @@ attrs_find(
 )
 {
        for ( ; a != NULL; a = a->a_next ) {
-               if ( is_ad_subtype( a->a_desc, desc ) == 0 ) {
+               if ( is_ad_subtype( a->a_desc, desc ) ) {
                        return( a );
                }
        }
@@ -276,26 +278,22 @@ attr_delete(
 )
 {
        Attribute       **a;
-       Attribute       *save;
 
        for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-               /* not yet implemented */
+               if ( ad_cmp( (*a)->a_desc, desc ) == 0 )
 #else
-               if ( strcasecmp( (*a)->a_type, type ) == 0 ) {
-                       break;
-               }
+               if ( strcasecmp( (*a)->a_type, type ) == 0 )
 #endif
-       }
+               {
+                       Attribute       *save = *a;
+                       *a = (*a)->a_next;
+                       attr_free( save );
 
-       if ( *a == NULL ) {
-               return( 1 );
+                       return LDAP_SUCCESS;
+               }
        }
 
-       save = *a;
-       *a = (*a)->a_next;
-       attr_free( save );
-
-       return( 0 );
+       return LDAP_NO_SUCH_ATTRIBUTE;
 }