Install *.schema only

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index e1d273c552690d0ecafd1d4cfeb3830050b5f70b..dff429ded9a358e068cdca3db1ba3814cb09020b 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -130,7 +130,7 @@ attr_normalize( char *s )
  */
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-       /* not yet implemented */
+       /* not used */
 #else
 int
 attr_merge_fast(
@@ -145,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;
        }
 
@@ -229,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 );
                }
        }
@@ -284,7 +278,6 @@ attr_delete(
 )
 {
        Attribute       **a;
-       Attribute       *save;
 
        for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
@@ -293,18 +286,14 @@ attr_delete(
                if ( strcasecmp( (*a)->a_type, type ) == 0 )
 #endif
                {
-                       break;
-               }
-       }
+                       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;
 }