aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2008-04-18 10:30:52 +0000
committerMartin Willi <martin@strongswan.org>2008-04-18 10:30:52 +0000
commit40752254660c1de138f3ea430a99477a62ee464a (patch)
treec74400494e76a2e2dcd149aec720868f01b1a5fa /src/charon
parentab7ed97c9377fdae7dc599c17473f24b7be7ebd4 (diff)
downloadstrongswan-40752254660c1de138f3ea430a99477a62ee464a.tar.bz2
strongswan-40752254660c1de138f3ea430a99477a62ee464a.tar.xz
fixed peer config equality check
Diffstat (limited to 'src/charon')
-rw-r--r--src/charon/config/peer_cfg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/charon/config/peer_cfg.c b/src/charon/config/peer_cfg.c
index ca9394797..9c32a2e43 100644
--- a/src/charon/config/peer_cfg.c
+++ b/src/charon/config/peer_cfg.c
@@ -471,7 +471,8 @@ static bool equals(private_peer_cfg_t *this, private_peer_cfg_t *other)
(this->virtual_ip == other->virtual_ip ||
(this->virtual_ip && other->virtual_ip &&
this->virtual_ip->equals(this->virtual_ip, other->virtual_ip))) &&
- (this->pool == other->pool || streq(this->pool, other->pool)) &&
+ (this->pool == other->pool ||
+ (this->pool && other->pool && streq(this->pool, other->pool))) &&
this->auth->equals(this->auth, other->auth)
#ifdef ME
&& this->mediation == other->mediation &&