From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 12 Jul 2010 20:38:18 +0000 (+0200)
Subject: changed ordering of statusattr output
X-Git-Tag: 4.4.1~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c13a4b40303eb0ae63bac88fe7a8420893898017;p=thirdparty%2Fstrongswan.git

changed ordering of statusattr output
---

diff --git a/src/libhydra/plugins/attr_sql/pool_attributes.c b/src/libhydra/plugins/attr_sql/pool_attributes.c
index 3ae073c573..7e3cb8607c 100644
--- a/src/libhydra/plugins/attr_sql/pool_attributes.c
+++ b/src/libhydra/plugins/attr_sql/pool_attributes.c
@@ -580,20 +580,18 @@ void status_attr(bool hexout)
 
 	/* enumerate over all attributes */
 	enumerator = db->query(db,
-					"SELECT identities.type, identities.data, "
-					"attribute_pools.name, attributes.type, attributes.value "
+					"SELECT attributes.type, attribute_pools.name, "
+					"identities.type, identities.data, attributes.value "
 					"FROM attributes "
 					"LEFT OUTER JOIN identities "
 					"ON attributes.identity = identities.id "
 					"LEFT OUTER JOIN attribute_pools "
-					"ON attributes.pool = attribute_pools.id "
-					"ORDER BY identities.type, identities.data, "
-					"attribute_pools.name, attributes.type",
-					DB_INT, DB_BLOB, DB_TEXT, DB_INT, DB_BLOB);
+					"ON attributes.pool = attribute_pools.id",
+					DB_INT, DB_TEXT, DB_INT, DB_BLOB, DB_BLOB);
 	if (enumerator)
 	{
-		while (enumerator->enumerate(enumerator, &identity_type,
-							&identity_chunk, &pool_name, &type, &value))
+		while (enumerator->enumerate(enumerator, &type,&pool_name,
+									 &identity_type, &identity_chunk, &value))
 		{
 			if (first)
 			{