From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 28 Dec 2010 15:59:48 +0000 (+0000)
Subject: ITS#6686 Fix last commit (declaration after code)
X-Git-Tag: MIGRATION_CVS2GIT~331
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=027b6812eed77582a73b529bcf090d2ba8008730;p=openldap

ITS#6686 Fix last commit (declaration after code)
---

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 1fa6e7eb1c..4d0bc91298 100644
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -164,11 +164,13 @@ static int node_cmp( const void* val1, const void* val2 )
 {
 	sort_node *sn1 = (sort_node *)val1;
 	sort_node *sn2 = (sort_node *)val2;
-	assert( sort_conns[sn1->sn_conn] && sort_conns[sn1->sn_conn][sn1->sn_session]
-		&& sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl );
-	sort_ctrl *sc = sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl;
+	sort_ctrl *sc;
 	MatchingRule *mr;
 	int i, cmp = 0;
+	assert( sort_conns[sn1->sn_conn]
+		&& sort_conns[sn1->sn_conn][sn1->sn_session]
+		&& sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl );
+	sc = sort_conns[sn1->sn_conn][sn1->sn_session]->so_ctrl;
 
 	for ( i=0; cmp == 0 && i<sc->sc_nkeys; i++ ) {
 		if ( BER_BVISNULL( &sn1->sn_vals[i] )) {