denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed ordering of statusattr output

Browse Source
This commit is contained in:
Andreas Steffen
2010-07-12 22:38:18 +02:00
parent bb021fbbc9
commit c13a4b4030
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/attr_sql/pool_attributes.c
+6 -8
View File
@@ -580,20 +580,18 @@ void status_attr(bool hexout)
/* enumerate over all attributes */ /* enumerate over all attributes */
enumerator = db->query(db, enumerator = db->query(db,
"SELECT identities.type, identities.data, " "SELECT attributes.type, attribute_pools.name, "
"attribute_pools.name, attributes.type, attributes.value " "identities.type, identities.data, attributes.value "
"FROM attributes " "FROM attributes "
"LEFT OUTER JOIN identities " "LEFT OUTER JOIN identities "
"ON attributes.identity = identities.id " "ON attributes.identity = identities.id "
"LEFT OUTER JOIN attribute_pools " "LEFT OUTER JOIN attribute_pools "
"ON attributes.pool = attribute_pools.id " "ON attributes.pool = attribute_pools.id",
"ORDER BY identities.type, identities.data, " DB_INT, DB_TEXT, DB_INT, DB_BLOB, DB_BLOB);
"attribute_pools.name, attributes.type",
DB_INT, DB_BLOB, DB_TEXT, DB_INT, DB_BLOB);
if (enumerator) if (enumerator)
{ {
while (enumerator->enumerate(enumerator, &identity_type, while (enumerator->enumerate(enumerator, &type,&pool_name,
&identity_chunk, &pool_name, &type, &value)) &identity_type, &identity_chunk, &value))
{ {
if (first) if (first)
{ {