diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-07-12 22:38:18 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2010-07-12 22:38:18 +0200 |
| commit | c13a4b40303eb0ae63bac88fe7a8420893898017 (patch) | |
| tree | 3ee3ffce21491f1a12aedbe8a8c99fa0c74aa4d5 /src/libhydra | |
| parent | bb021fbbc98cb7e451778be0c150ccafbc8b7d5e (diff) | |
| download | strongswan-c13a4b40303eb0ae63bac88fe7a8420893898017.tar.bz2 strongswan-c13a4b40303eb0ae63bac88fe7a8420893898017.tar.xz | |
changed ordering of statusattr output
Diffstat (limited to 'src/libhydra')
| -rw-r--r-- | src/libhydra/plugins/attr_sql/pool_attributes.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/libhydra/plugins/attr_sql/pool_attributes.c b/src/libhydra/plugins/attr_sql/pool_attributes.c index 3ae073c57..7e3cb8607 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) { |