diff options
author | Adrian-Ken Rueegsegger <ken@codelabs.ch> | 2017-04-26 13:46:26 +0200 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2017-05-23 16:36:35 +0200 |
commit | 6a8a44be88b079ace805cddb08544af5e2b27ddd (patch) | |
tree | e1956c93de43c319a4524093b1b5266120b73f85 /src | |
parent | 08b19dd02a4911c07a0c636726af05a5c537bc64 (diff) | |
download | strongswan-6a8a44be88b0.tar.bz2 strongswan-6a8a44be88b0.tar.xz |
credential-manager: Prefer local over global sets
Invert set enumeration order to first enumerate local and then global
credential sets.
Diffstat (limited to 'src')
-rw-r--r-- | src/libstrongswan/credentials/credential_manager.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libstrongswan/credentials/credential_manager.c b/src/libstrongswan/credentials/credential_manager.c index 95c5cd777..8e8be7ef2 100644 --- a/src/libstrongswan/credentials/credential_manager.c +++ b/src/libstrongswan/credentials/credential_manager.c @@ -166,19 +166,19 @@ METHOD(enumerator_t, sets_enumerate, bool, return TRUE; } } - if (this->global) + if (this->local) { - if (this->global->enumerate(this->global, set)) + if (this->local->enumerate(this->local, set)) { return TRUE; } - /* end of global sets, look for local */ - this->global->destroy(this->global); - this->global = NULL; + /* end of local sets, look for global */ + this->local->destroy(this->local); + this->local = NULL; } - if (this->local) + if (this->global) { - return this->local->enumerate(this->local, set); + return this->global->enumerate(this->global, set); } return FALSE; } |