From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 12 Apr 2013 17:32:01 +0000 (+0200)
Subject: charon-cmd: match_me/match_other are optional in callback credentials
X-Git-Tag: 5.1.0dr1~149^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f77d6e16d2f50645ab7099eb1ac72b2059da994f;p=thirdparty%2Fstrongswan.git

charon-cmd: match_me/match_other are optional in callback credentials
---

diff --git a/src/charon-cmd/cmd/cmd_creds.c b/src/charon-cmd/cmd/cmd_creds.c
index 9a37edff50..4626c6dbea 100644
--- a/src/charon-cmd/cmd/cmd_creds.c
+++ b/src/charon-cmd/cmd/cmd_creds.c
@@ -96,7 +96,14 @@ static shared_key_t* callback_shared(private_cmd_creds_t *this,
 		return NULL;
 	}
 	this->prompted = TRUE;
-	*match_me = *match_other = ID_MATCH_PERFECT;
+	if (match_me)
+	{
+		*match_me = ID_MATCH_PERFECT;
+	}
+	if (match_other)
+	{
+		*match_other = ID_MATCH_PERFECT;
+	}
 	return shared_key_create(type, chunk_clone(chunk_from_str(pwd)));
 }