Merge branch 'glendale' into hollywoodhollister

2 files changed, 26 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 5d4bf0f..9b24e7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+vyatta-cfg-vpn (0.6) unstable; urgency=low
+
+  VC4.0.2
+
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Sat, 19 Apr 2008 11:56:04 -0700
+
+vyatta-cfg-vpn (0.5) unstable; urgency=low
+
+  VC4.0.2 release candidate
+  [ Mark O'Brien ]
+
+
+  [ Stig Thormodsrud ]
+  * Fix 3046: vpn: transport mode not working with current vyatta config
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Wed, 16 Apr 2008 09:50:06 -0700
+
 vyatta-cfg-vpn (0.4) unstable; urgency=low
 
   3.0.2
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl
index 925b234..b82ebfd 100755
--- a/scripts/vpn-config.pl
+++ b/scripts/vpn-config.pl
@@ -424,10 +424,6 @@ if ($vcVPN->exists('ipsec')) {
 	    # Write tunnel configuration
 	    #
 	    my $leftsubnet = $vcVPN->returnValue("ipsec site-to-site peer $peer tunnel $tunnel local-subnet");
-	    if (!defined($leftsubnet) || $leftsubnet eq "") {
-		$error = 1;
-		print STDERR "VPN configuration error.  No 'local-subnet' specified for peer \"$peer\" tunnel $tunnel.\n";
-	    }
 	    if (defined($leftsubnet) && $leftsubnet eq 'any') {
 		$leftsubnet = '0.0.0.0/0';
 	    }
@@ -462,10 +458,6 @@ if ($vcVPN->exists('ipsec')) {
 		    $rightsubnet .= ",%no";
 		}
 	    } else {
-		if (!defined($remotesubnet) || $remotesubnet eq '') {
-		    $error = 1;
-		    print STDERR "VPN configuration error.  The 'remote-subnet' has not been specified while 'allow-nat-networks' has not been enabled for peer \"$peer\" tunnel $tunnel.  Either one required.\n";
-		}
 		$rightsubnet = $remotesubnet;
 		if (defined($rightsubnet) && $rightsubnet eq 'any') {
 		    $rightsubnet = '0.0.0.0/0';
@@ -615,6 +607,12 @@ if ($vcVPN->exists('ipsec')) {
 	        if (!defined($espmode) || $espmode eq '') {
 		    $espmode = "tunnel";
 	        }
+                if ($espmode eq "transport") {
+		    if (defined $leftsubnet or defined $rightsubnet) {
+			$error = 1;
+			print STDERR "VPN configuration error.  Can not use local-subnet or remote-subnet when using transport mode\n";
+		    }
+		}
 	        $genout .= "\ttype=$espmode\n";
 	    
 	        #