From 522a95b69f7bd52811829f562a9192d2ffa76d73 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 28 Apr 2008 03:51:40 +0000
Subject: Pass mode

---
 etc/inc/openvpn.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'etc/inc/openvpn.inc')

diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 237fffe..be88682 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -46,11 +46,12 @@ require_once('pfsense-utils.inc');
 require_once('util.inc');
 
 // Shutdown running process if needed
-function openvpn_delete($id) {
+function openvpn_delete($mode, $id) {
 	global $g, $config;
+	
 	$settings = $config['installedpackages']["openvpn$mode"]['config'][$id];	
 	$mode = $settings['mode'];
-	$ps = $g['varetc_path'] . "/openvpn_server{$id}.conf";
+	$ps = $g['varetc_path'] . "/openvpn_{$mode}{$id}.conf";
 	$ps_id = `ps awux | grep $ps | awk '{ print \$2 }'`;
 	killbypid($ps_id);
 }
-- 
cgit v1.1