From 6a8a44be88b079ace805cddb08544af5e2b27ddd Mon Sep 17 00:00:00 2001 From: Adrian-Ken Rueegsegger Date: Wed, 26 Apr 2017 13:46:26 +0200 Subject: [PATCH] credential-manager: Prefer local over global sets Invert set enumeration order to first enumerate local and then global credential sets. --- src/libstrongswan/credentials/credential_manager.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libstrongswan/credentials/credential_manager.c b/src/libstrongswan/credentials/credential_manager.c index 95c5cd7776..8e8be7ef23 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; } -- 2.47.3