Merge branch 'multi-vip'
authorMartin Willi <martin@revosec.ch>
Fri, 31 Aug 2012 10:55:56 +0000 (12:55 +0200)
committerMartin Willi <martin@revosec.ch>
Fri, 31 Aug 2012 10:55:56 +0000 (12:55 +0200)
commit1323dc1138246a6e2819bcc20b167b75d52e6d7c
tree5081fcc1d015a8cd0ec6dfe39a8df14f12d86ac5
parent868409139b00f24607baab2d81b873cb1a5a9e5b
parent69e056a2c13ac7da9ed4e48f846d642aa01a362b
Merge branch 'multi-vip'

Brings support for multiple virtual IPs and multiple pools in
left/rigthsourceip definitions. Also introduces the new left/rightdns
options to configure requested DNS server address family and respond
with multiple connection specific servers.
NEWS
man/ipsec.conf.5.in
src/libcharon/plugins/stroke/stroke_config.c
src/libcharon/sa/ikev1/phase1.c