Merge remote branch 'upstream/master'

7 files changed, 19 insertions, 19 deletions

diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index 805ea44..159e791 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -1216,7 +1216,9 @@ function session_auth() {
 			$_SESSION['Logged_In'] = "True";
 			$_SESSION['Username'] = $_POST['usernamefld'];
 			$_SESSION['last_access'] = time();
-			log_auth("Successful webConfigurator login for user '{$_POST['usernamefld']}' from {$_SERVER['REMOTE_ADDR']}");
+			if(! isset($config['system']['webgui']['quietlogin'])) {
+				log_auth("Successful webConfigurator login for user '{$_POST['usernamefld']}' from {$_SERVER['REMOTE_ADDR']}");
+			}
 			$HTTP_SERVER_VARS['AUTH_USER'] = $_SESSION['Username'];
 			if (isset($_POST['postafterlogin']))
 				return true;
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index a51c36e..01cdfc7 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -124,7 +124,7 @@ function filter_pflog_start() {
 	}
 	mute_kernel_msgs();
 	$output = 0;
-	exec("/bin/pgrep -f 'tcpdump -s 256 -v -l -n -e -ttt -i pflog0'", $output, $retval);
+	exec("/bin/pgrep -af 'tcpdump -s 256 -v -l -n -e -ttt -i pflog0'", $output, $retval);
 	if($retval != 0)
 		mwexec_bg("/usr/sbin/tcpdump -s 256 -v -l -n -e -ttt -i pflog0 | logger -t pf -p local0.info");
 	unmute_kernel_msgs();
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index d32423d..be86bac 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2492,7 +2492,7 @@ function kill_wpasupplicant($interface) {
 
 function find_dhclient_process($interface) {
 	if ($interface)
-		$pid = `/bin/pgrep -xf "dhclient: {$interface}"`;
+		$pid = `/bin/pgrep -axf "dhclient: {$interface}"`;
 	else
 		$pid = 0;
 
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc
index 3588953..895eb57 100644
--- a/etc/inc/service-utils.inc
+++ b/etc/inc/service-utils.inc
@@ -34,7 +34,7 @@
  */
 
 /*
-	pfSense_BUILDER_BINARIES:	/bin/pkill /bin/pgrep /bin/sh /usr/bin/killall
+	pfSense_BUILDER_BINARIES:	/bin/pgrep /bin/sh /usr/bin/killall
 	pfSense_MODULE:	utils
 */
 
@@ -207,4 +207,4 @@ function is_service_running($service, $ps = "") {
 	return false;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index d40accb..1afc23a 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -32,7 +32,7 @@
 */
 
 /*
-	pfSense_BUILDER_BINARIES:	/usr/bin/killall	/bin/sh	/usr/local/sbin/dhcpd	/usr/local/sbin/igmpproxy
+	pfSense_BUILDER_BINARIES:	/usr/bin/killall	/bin/pgrep	/bin/sh	/usr/local/sbin/dhcpd	/usr/local/sbin/igmpproxy
 	pfSense_BUILDER_BINARIES:	/sbin/ifconfig	/usr/sbin/arp	/sbin/ifconfig	/usr/local/sbin/dnsmasq
 	pfSense_BUILDER_BINARIES:	/usr/sbin/bsnmpd	/sbin/route	/usr/local/sbin/olsrd
 	pfSense_BUILDER_BINARIES:	/usr/local/sbin/miniupnpd	/usr/sbin/rtadvd
@@ -1644,7 +1644,7 @@ function upnp_action ($action) {
 				mwexec_bg('/usr/local/sbin/miniupnpd -f /var/etc/miniupnpd.conf');
 			break;
 		case "stop":
-			while((int)exec("pgrep miniupnpd | wc -l") > 0)
+			while((int)exec("/bin/pgrep -a miniupnpd | wc -l") > 0)
 				mwexec('killall miniupnpd 2>/dev/null', true);
 			mwexec('/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null');
 			mwexec('/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null');
@@ -1657,21 +1657,16 @@ function upnp_action ($action) {
 }
 
 function upnp_start() {
-	global $config, $g;
+	global $config;
 
 	if(!isset($config['installedpackages']['miniupnpd']['config']))
 		return;
 
 	if($config['installedpackages']['miniupnpd']['config'][0]['enable']) {
-		if($g['booting']) {
-			echo "Starting UPnP service... ";
-			require_once('/usr/local/pkg/miniupnpd.inc');
-			sync_package_miniupnpd();
-			echo "done.\n";
-		}
-		else {
-			upnp_action('start');
-		}
+		echo "Starting UPnP service... ";
+		require_once('/usr/local/pkg/miniupnpd.inc');
+		sync_package_miniupnpd();
+		echo "done.\n";
 	}
 }
 
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 370f891..ced3085 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -50,7 +50,7 @@ function isvalidpid($pid) {
 
 function is_process_running($process) {
 	$output = "";
-	exec("/bin/pgrep -x {$process}", $output, $retval);
+	exec("/bin/pgrep -ax {$process}", $output, $retval);
 
         return (intval($retval) == 0);
 }
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 624098d..2e72a6d 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -164,7 +164,10 @@ function vpn_ipsec_configure($ipchg = false)
 					if (!is_ipaddr($rg))
 						continue;
 				}
-
+				if(array_search($rg, $rgmap)) {
+					log_error("The remote gateway {$rg} already exists on another phase 1 entry");
+					continue;
+				}
 				$rgmap[$ph1ent['remote-gateway']] = $rg;
 
 				/* step through each phase2 entry */