diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2009-04-30 11:37:54 +0000 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2009-04-30 11:37:54 +0000 |
| commit | d24a74c5b4fb62b720a79b632021746b69de7c45 (patch) | |
| tree | fd8854673b9d72059d7f9459a82663d5a70617ce /src/charon/config | |
| parent | 466f11bfaf56c389947b2cbee6dd4f1fb56a821e (diff) | |
| download | strongswan-d24a74c5b4fb62b720a79b632021746b69de7c45.tar.bz2 strongswan-d24a74c5b4fb62b720a79b632021746b69de7c45.tar.xz | |
merging changes from portability branch back to trunk
important change for developers: %Y replaces %D to print identities!
Diffstat (limited to 'src/charon/config')
| -rw-r--r-- | src/charon/config/auth_cfg.c | 6 | ||||
| -rw-r--r-- | src/charon/config/backend_manager.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/charon/config/auth_cfg.c b/src/charon/config/auth_cfg.c index 87aca3813..c8566087c 100644 --- a/src/charon/config/auth_cfg.c +++ b/src/charon/config/auth_cfg.c @@ -340,7 +340,7 @@ static bool complies(private_auth_cfg_t *this, auth_cfg_t *constraints, if (!success && log_error) { DBG1(DBG_CFG, "constraint check failed: peer not " - "authenticated by CA '%D'.", c1->get_subject(c1)); + "authenticated by CA '%Y'.", c1->get_subject(c1)); } break; } @@ -356,7 +356,7 @@ static bool complies(private_auth_cfg_t *this, auth_cfg_t *constraints, if (log_error) { DBG1(DBG_CFG, "constraint check failed: peer not " - "authenticated with peer cert '%D'.", + "authenticated with peer cert '%Y'.", c1->get_subject(c1)); } } @@ -411,7 +411,7 @@ static bool complies(private_auth_cfg_t *this, auth_cfg_t *constraints, success = FALSE; if (log_error) { - DBG1(DBG_CFG, "constraint check failed: %sidentity '%D'" + DBG1(DBG_CFG, "constraint check failed: %sidentity '%Y'" " required ", t1 == AUTH_RULE_IDENTITY ? "" : "EAP ", id1); } diff --git a/src/charon/config/backend_manager.c b/src/charon/config/backend_manager.c index 28e50ef0a..43d9594fe 100644 --- a/src/charon/config/backend_manager.c +++ b/src/charon/config/backend_manager.c @@ -339,7 +339,7 @@ static enumerator_t *create_peer_cfg_enumerator(private_backend_manager_t *this, return enumerator; } - DBG1(DBG_CFG, "looking for peer configs matching %H[%D]...%H[%D]", + DBG1(DBG_CFG, "looking for peer configs matching %H[%Y]...%H[%Y]", me, my_id, other, other_id); configs = linked_list_create(); |