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 685d97bc9ebefc0e76fc50d3cdec3ab5db1bd548..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,
@@ -290,10 +286,10 @@ attr_delete(
                        *a = (*a)->a_next;
                        attr_free( save );
 
-                       return 0;
+                       return LDAP_SUCCESS;
                }
        }
 
-       return 1;
+       return LDAP_NO_SUCH_ATTRIBUTE;
 }