Merge pull request #1125 from doktornotor/patch-9

2 files changed, 47 insertions, 5 deletions

diff --git a/config/stunnel/stunnel.priv.inc b/config/stunnel/stunnel.priv.inc
new file mode 100644
index 00000000..f9857583
--- /dev/null
+++ b/config/stunnel/stunnel.priv.inc
@@ -0,0 +1,42 @@
+<?php
+/*
+	stunnel.priv.inc
+	part of pfSense (http://www.pfSense.org/)
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+global $priv_list;
+
+$priv_list['page-services-stunnel'] = array();
+$priv_list['page-services-stunnel']['name'] = "WebCfg - Services: stunnel package";
+$priv_list['page-services-stunnel']['descr'] = "Allow access to stunnel package GUI";
+$priv_list['page-services-stunnel']['match'] = array();
+
+$priv_list['page-services-stunnel']['match'][] = "pkg.php?xml=stunnel.xml*";
+$priv_list['page-services-stunnel']['match'][] = "pkg.php?xml=stunnel_certs.xml*";
+
+$priv_list['page-services-stunnel']['match'][] = "pkg_edit.php?xml=stunnel.xml*";
+$priv_list['page-services-stunnel']['match'][] = "pkg_edit.php?xml=stunnel_certs.xml*";
+
+?>
diff --git a/config/stunnel/stunnel.xml b/config/stunnel/stunnel.xml
index c8957ba8..b5dfd6bd 100644
--- a/config/stunnel/stunnel.xml
+++ b/config/stunnel/stunnel.xml
@@ -42,14 +42,10 @@
 	]]>
 	</copyright>
 	<name>stunnel</name>
-	<version>5.20.2</version>
+	<version>5.20.3</version>
 	<title>Services: Secure Tunnel</title>
 	<menu>
 		<name>STunnel</name>
-		<tooltiptext>The stunnel program is designed to work as an SSL encryption wrapper between remote client and local (inetd-startable) or remote server.
-		It can be used to add SSL functionality to commonly used inetd daemons like POP2, POP3, and IMAP servers without any changes in the programs' code.
-		It will negotiate an SSL connection using the OpenSSL or SSLeay libraries.
-		It calls the underlying crypto libraries, so stunnel supports whatever cryptographic algorithms you compiled into your crypto package.</tooltiptext>
 		<section>Services</section>
 		<configfile>stunnel.xml</configfile>
 	</menu>
@@ -59,6 +55,10 @@
 		<item>https://packages.pfsense.org/packages/config/stunnel/stunnel.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/stunnel/stunnel.priv.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/stunnel/stunnel_certs.xml</item>
 	</additional_files_needed>