X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fattr.c;h=dff429ded9a358e068cdca3db1ba3814cb09020b;hb=a5ee438c9394a19a241716d3d922299c20b0365d;hp=dd1d3b612e0669562d08143f95fd51d5b5c0a65e;hpb=72db2b73dcc7a8e99fe2c76eb321f10037af53e2;p=openldap

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index dd1d3b612e..dff429ded9 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -223,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 );
 		}
 	}
@@ -278,7 +278,6 @@ attr_delete(
 )
 {
 	Attribute	**a;
-	Attribute	*save;
 
 	for ( a = attrs; *a != NULL; a = &(*a)->a_next ) {
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
@@ -287,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;
 }