A couple more double expansion bugs. I don't do this enough...

bin/setup-vpn.sh

@@ -125,7 +125,7 @@ persist-tun
 status openvpn-status.log
 verb 3
 
-push "route $MLAN_NETWORK $MLAN_MASK"
+push "route $mlan_NETWORK $mlan_MASK"
 EOF
     elif [ $VPNTYPE = 'bridged' ]; then
 	echo "bridged VPNTYPE not yet supported!"
@@ -182,11 +182,11 @@ for aggprefix in $AGGREGATES ; do
     eval "agghost=\$$varname"
     eval "varname=${aggprefix}_GW"
     eval "agg_gw=\$$varname"
-    eval "varname=$agglan_NETWORK"
+    eval "varname=${agglan}_NETWORK"
     eval "agg_net=\$$varname"
-    eval "varname=$agglan_MASK"
+    eval "varname=${agglan}_MASK"
     eval "agg_mask=\$$varname"
-    eval "varname=$agglan_CIDR"
+    eval "varname=${agglan}_CIDR"
     eval "agg_cidr=\$$varname"
     aggnum=`echo $aggprefix | sed -n -r -e 's/^agg([0-9]+)$/\1/p'`