From 7ae39738464171d00258cd69ec25b2d4ca4af92a Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 9 Jul 2015 18:19:16 +0000
Subject: [PATCH] (legacy) cleanups vpn.inc

---
 src/etc/inc/vpn.inc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index 959346fe1..22de6428a 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -1132,7 +1132,7 @@ EOD;
 function vpn_pppoes_configure() {
 	global $config;
 
-	if (is_array($config['pppoes']['pppoe'])) {
+	if (isset($config['pppoes']['pppoe']) && is_array($config['pppoes']['pppoe'])) {
 		foreach ($config['pppoes']['pppoe'] as $pppoe)
 			vpn_pppoe_configure($pppoe);
 	}
@@ -1352,10 +1352,14 @@ function vpn_l2tp_configure()
 	global $config, $g;
 
 	$syscfg = $config['system'];
-	$l2tpcfg = $config['l2tp'];
+	if (isset($config['l2tp'])) {
+		$l2tpcfg = $config['l2tp'];
+	} else {
+		return 0;
+	}
 
 	if (file_exists("/var/run/booting")) {
-		if (!$l2tpcfg['mode'] || ($l2tpcfg['mode'] == "off"))
+		if (!isset($l2tpcfg['mode']) || $l2tpcfg['mode'] == "off")
 			return 0;
 
 		echo gettext("Configuring l2tp VPN service... ");