Merge pull request #1124 from doktornotor/patch-8

5 files changed, 57 insertions, 10 deletions

diff --git a/config/sudo/sudo.priv.inc b/config/sudo/sudo.priv.inc
new file mode 100644
index 00000000..01cb2224
--- /dev/null
+++ b/config/sudo/sudo.priv.inc
@@ -0,0 +1,38 @@
+<?php
+/*
+	sudo.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-system-sudo'] = array();
+$priv_list['page-system-sudo']['name'] = "WebCfg - System: sudo package";
+$priv_list['page-system-sudo']['descr'] = "Allow access to sudo package GUI";
+$priv_list['page-system-sudo']['match'] = array();
+
+$priv_list['page-system-sudo']['match'][] = "pkg_edit.php?xml=sudo.xml*";
+
+?>
diff --git a/config/sudo/sudo.xml b/config/sudo/sudo.xml
index 6124a641..e2b92cf1 100644
--- a/config/sudo/sudo.xml
+++ b/config/sudo/sudo.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
 	<copyright>
 	<![CDATA[
@@ -42,7 +44,7 @@
 	<description>Sudo Command Control</description>
 	<requirements>None</requirements>
 	<name>sudo</name>
-	<version>0.2.7</version>
+	<version>0.2.8</version>
 	<title>Sudo - Shell Command Privilege Delegation Utility</title>
 	<include_file>/usr/local/pkg/sudo.inc</include_file>
 	<menu>
@@ -56,6 +58,10 @@
 		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/sudo/sudo.inc</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/sudo/sudo.priv.inc</item>
+	</additional_files_needed>
 	<fields>
 		<field>
 			<type>listtopic</type>
@@ -63,11 +69,14 @@
 		</field>
 		<field>
 			<type>info</type>
-			<description><![CDATA[
-User permission definitions for allowing the use of sudo by shell users to run commands as other users, such as root.
-<br /><br />More information on the full command options may be found in the <a href="http://www.sudo.ws/sudoers.man.html">sudoers manual</a>.
-<br /><br />By default the command is "ALL" meaning the user can run any commands. Leaving the commands field blank assumes "ALL". A comma-separated list of commands can be supplied to limit the user to individual binaries. Full paths to binaries must be used.
-			]]></description>
+			<description>
+			<![CDATA[
+				User permission definitions for allowing the use of sudo by shell users to run commands as other users, such as root.<br /><br />
+				More information on the full command options may be found in the <a href="http://www.sudo.ws/sudoers.man.html">sudoers manual</a>.<br /><br />
+				By default the command is "ALL" meaning the user can run any commands. Leaving the commands field blank assumes "ALL".<br /><br />
+				A comma-separated list of commands can be supplied to limit the user to individual binaries. <strong>Full paths to binaries must be used.</strong>
+			]]>
+			</description>
 		</field>
 		<field>
 			<fielddescr>User Permissions</fielddescr>
@@ -100,7 +109,7 @@ User permission definitions for allowing the use of sudo by shell users to run c
 				<rowhelperfield>
 					<fielddescr>Command List</fielddescr>
 					<fieldname>cmdlist</fieldname>
-					<description>Commands the user may run. Comma-separated list, full paths preferred. Default: ALL</description>
+					<description>Commands the user may run. Comma-separated list, full paths required. Default: ALL</description>
 					<type>input</type>
 					<size>30</size>
 					<value>ALL</value>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index b281e9d8..d2921a0d 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1624,7 +1624,7 @@
 		<descr>sudo allows delegation of privileges to users in the shell so commands can be run as other users, such as root.</descr>
 		<website>http://www.sudo.ws/</website>
 		<category>Security</category>
-		<version>0.2.7</version>
+		<version>0.2.8</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 75740448..232d6145 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1732,7 +1732,7 @@
 		<pkginfolink>https://doc.pfsense.org/index.php/Sudo_Package</pkginfolink>
 		<descr><![CDATA[sudo allows delegation of privileges to users in the shell so commands can be run as other users, such as root.]]></descr>
 		<category>Security</category>
-		<version>0.2.3</version>
+		<version>0.2.8</version>
 		<status>Beta</status>
 		<required_version>2.0.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 7610235a..87f1cb37 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1719,7 +1719,7 @@
 		<pkginfolink>https://doc.pfsense.org/index.php/Sudo_Package</pkginfolink>
 		<descr><![CDATA[sudo allows delegation of privileges to users in the shell so commands can be run as other users, such as root.]]></descr>
 		<category>Security</category>
-		<version>0.2.3</version>
+		<version>0.2.8</version>
 		<status>Beta</status>
 		<required_version>2.0.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/sudo/sudo.xml</config_file>