From 2b32c8bbcfc8fba0db661a05414858cbf1ed5899 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 4 Aug 2007 22:35:38 +0000 Subject: [PATCH] Fix LDAPDN_rewrite / AVA_Sort in prev commit --- servers/slapd/dn.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c index 9143096db4..832eae60d4 100644 --- a/servers/slapd/dn.c +++ b/servers/slapd/dn.c @@ -442,7 +442,7 @@ LDAPRDN_rewrite( LDAPRDN rdn, unsigned flags, void *ctx ) static int LDAPDN_rewrite( LDAPDN dn, unsigned flags, void *ctx ) { - int iRDN; + int iRDN, do_sort = 0; int rc; assert( dn != NULL ); @@ -461,7 +461,6 @@ LDAPDN_rewrite( LDAPDN dn, unsigned flags, void *ctx ) slap_syntax_transform_func *transf = NULL; MatchingRule *mr = NULL; struct berval bv = BER_BVNULL; - int do_sort = 0; assert( ava != NULL ); @@ -562,10 +561,13 @@ LDAPDN_rewrite( LDAPDN dn, unsigned flags, void *ctx ) ava->la_flags |= LDAP_AVA_FREE_VALUE; } - if( do_sort ) AVA_Sort( rdn, iAVA ); + } + if( do_sort ) { + rc = AVA_Sort( rdn, iAVA ); + if ( rc != LDAP_SUCCESS ) + return rc; } } - return LDAP_SUCCESS; } -- 2.39.5