merged multi-auth branch back into trunk

This commit is contained in:
Martin Willi committed 2009-04-14 10:34:24 +00:00
1 parent 6e5c8d9413
commit a44bb9345f
230 files changed
+6163 -4193

No files matched your search

@@ -1,3 +1,3 @@
232420100000015,30000000000000000000000000000000,30112233,305566778899AABB
232420100000015,31000000000000000000000000000000,31112233,315566778899AABB
232420100000015,32000000000000000000000000000000,32112233,325566778899AABB
228060123456001,30000000000000000000000000000000,30112233,305566778899AABB
228060123456001,31000000000000000000000000000000,31112233,315566778899AABB
228060123456001,32000000000000000000000000000000,32112233,325566778899AABB
@@ -16,7 +16,7 @@ conn home
leftnexthop=%direct
leftid=carol@strongswan.org
leftfirewall=yes
eap_identity=232420100000015
eap_identity=228060123456001
right=PH_IP_MOON
rightid=@moon.strongswan.org
rightsubnet=10.1.0.0/16