[PATCH] ITS#9412 fix AVA_Sort on invalid RDN

Gbp-Pq: Name ITS-9412-fix-AVA_Sort-on-invalid-RDN.patch

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index c3465498d7f6fbc3a50d699a67293af512cc471c..4ac6cf313120a2cc0c6fea67d7875d346c221804 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -233,6 +233,7 @@ AVA_Sort( LDAPRDN rdn, int nAVAs )
 {
        LDAPAVA *ava_i;
        int             i;
+       int             rc = LDAP_SUCCESS;
 
        assert( rdn != NULL );
 
@@ -250,7 +251,7 @@ AVA_Sort( LDAPRDN rdn, int nAVAs )
                        /* RFC4512 does not allow multiple AVAs
                         * with the same attribute type in RDN (ITS#5968) */
                        if ( a == 0 )
-                               return LDAP_INVALID_DN_SYNTAX;
+                               rc = LDAP_INVALID_DN_SYNTAX;
 
                        if ( a > 0 )
                                break;
@@ -259,7 +260,7 @@ AVA_Sort( LDAPRDN rdn, int nAVAs )
                }
                rdn[ j+1 ] = ava_i;
        }
-       return LDAP_SUCCESS;
+       return rc;
 }
 
 static int