Prepare for unifdef -DSLAPD_SCHEMA_NOT_COMPAT

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 481d1c7adf3353308867ea5f6e25bfe261141363..655ce17341bafbd9d2782876c83b3966ee7d3fe8 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -119,7 +119,6 @@ attr_normalize( char *s )
 
        return( ldap_pvt_str2lower( s ) );
 }
-#endif
 
 /*
  * attr_merge_fast - merge the given type and value with the list of
@@ -129,9 +128,6 @@ attr_normalize( char *s )
  *             -1      trouble
  */
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       /* not used */
-#else
 int
 attr_merge_fast(
     Entry              *e,
@@ -278,7 +274,6 @@ attr_delete(
 )
 {
        Attribute       **a;
-       Attribute       *save;
 
        for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
@@ -287,18 +282,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;
 }