From 149313fd25adc504f38ee1a9198731151dd211db Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 23 Dec 2010 21:36:57 +0000 Subject: [PATCH] ITS#6573 export compare_entry as slap_compare_entry() --- servers/slapd/compare.c | 11 +++-------- servers/slapd/proto-slap.h | 9 +++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c index 0d64b735e2..0cc3181645 100644 --- a/servers/slapd/compare.c +++ b/servers/slapd/compare.c @@ -31,11 +31,6 @@ #include "slap.h" -static int compare_entry( - Operation *op, - Entry *e, - AttributeAssertion *ava ); - int do_compare( Operation *op, @@ -176,7 +171,7 @@ fe_op_compare( Operation *op, SlapReply *rs ) } if( entry ) { - rs->sr_err = compare_entry( op, entry, ava ); + rs->sr_err = slap_compare_entry( op, entry, ava ); entry_free( entry ); send_ldap_result( op, rs ); @@ -352,7 +347,7 @@ cleanup:; return rs->sr_err; } -static int compare_entry( +int slap_compare_entry( Operation *op, Entry *e, AttributeAssertion *ava ) @@ -373,7 +368,7 @@ static int compare_entry( goto done; } - for(a = attrs_find( e->e_attrs, ava->aa_desc ); + for(; a != NULL; a = attrs_find( a->a_next, ava->aa_desc )) { diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 138739aef7..27e6d3945d 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -518,6 +518,15 @@ LDAP_SLAPD_F (void) ch_free LDAP_P(( void * )); #define free ch_free #endif +/* + * compare.c + */ + +LDAP_SLAPD_F (int) slap_compare_entry LDAP_P(( + Operation *op, + Entry *e, + AttributeAssertion *ava )); + /* * component.c */ -- 2.39.5