merged multi-auth branch back into trunk

2009-04-14 10:34:24 +00:00
parent 6e5c8d9413
commit a44bb9345f
230 changed files with 6163 additions and 4193 deletions
@@ -16,7 +16,7 @@ conn home
 	leftnexthop=%direct
 	[email protected]
 	leftfirewall=yes
-	eap_identity=232420100000015
+	eap_identity=228060123456001
 	right=PH_IP_MOON
 	[email protected]
 	rightsubnet=10.1.0.0/16