From 14a40cf79a2bc960d2e8dd2f2ad51b28dcc07863 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 23 Feb 2016 10:31:41 +0100
Subject: [PATCH] vpn: fix and improve service probing

---
 src/etc/inc/plugins.inc.d/vpn.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/vpn.inc b/src/etc/inc/plugins.inc.d/vpn.inc
index 557b0c145..15739b445 100644
--- a/src/etc/inc/plugins.inc.d/vpn.inc
+++ b/src/etc/inc/plugins.inc.d/vpn.inc
@@ -45,7 +45,7 @@ function vpn_services()
 
     $services = array();
 
-    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] != 'off') {
+    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == 'server') {
         $services[] = array(
             'description' => gettext('PPTP Server'),
             'pidfile' => '/var/run/pptp-vpn.pid',
@@ -57,7 +57,7 @@ function vpn_services()
         );
     }
 
-    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] != 'off') {
+    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == 'server') {
         $services[] = array(
             'description' => gettext('L2TP Server'),
             'pidfile' => '/var/run/l2tp-vpn.pid',
@@ -71,7 +71,7 @@ function vpn_services()
 
     if (isset($config['pppoes']['pppoe'])) {
         foreach ($config['pppoes']['pppoe'] as $pppoecfg) {
-            if (isset($pppoecfg['mode']) || $pppoecfg['mode'] != 'off') {
+            if (isset($pppoecfg['mode']) && $pppoecfg['mode'] == 'server') {
                 $services[] = array(
                     'description' => gettext('PPPoE Server') . ': ' . htmlspecialchars($pppoecfg['descr']),
                     'php' => array(