From f5780da72ffc72de91e2dddb2ee22b1f179b3ad9 Mon Sep 17 00:00:00 2001
From: Seth Mos <seth.mos@xs4all.nl>
Date: Sat, 6 Sep 2008 20:44:44 +0000
Subject: [PATCH] Check in fix that hopefully fixes IPSEC on pppoe or pptp

---
 etc/inc/vpn.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 353c13f9ce..c7c3b1a550 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -864,7 +864,12 @@ function vpn_endpoint_determine($tunnel, $curwanip) {
 		if(preg_match("/^carp/i", $tunnel['interface'])) {
 			$iface = $tunnel['interface'];
 		} else {
-			$iface = $config['interfaces'][$tunnel['interface']]['if'];
+			if($config['interfaces'][$tunnel['interface']]['ipaddr'] == "pppoe" OR 
+				$config['interfaces'][$tunnel['interface']]['ipaddr'] == "pptp") {
+				$iface = "ng0";
+			} else {
+				$iface = $config['interfaces'][$tunnel['interface']]['if'];
+			}
 		}
 		$oc = $config['interfaces'][$tunnel['interface']];
 		/* carp ips, etc */