From 6fa41b8cae6e3dad75c2775f6dfc8d67475672dd Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 11 Aug 2015 14:32:03 +0200
Subject: [PATCH] crash reporter: two issues (one really, undo a fix that did
 not work)

---
 src/etc/inc/filter.inc        | 17 +++++++----------
 src/etc/inc/pfsense-utils.inc |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index 0820308b1..030764333 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -394,16 +394,13 @@ function filter_generate_scrubing() {
 		}
 
 		/* set up MSS clamping */
-		if (isset($scrubcfg['if'])) {
-			if (
-				$scrubcfg['mss'] != '' && is_numeric($scrubcfg['mss']) &&
-				$scrubcfg['if'] != 'pppoe' && $scrubcfg['if'] != 'pptp' &&
-				$scrubcfg['if'] != 'l2tp'
-			) {
-				$mssclamp = "max-mss " . (intval($scrubcfg['mss'] - 40));
-			} else {
-				$mssclamp = '';
-			}
+		$mssclamp = '';
+		if (
+			$scrubcfg['mss'] != '' && is_numeric($scrubcfg['mss']) &&
+			$scrubcfg['if'] != 'pppoe' && $scrubcfg['if'] != 'pptp' &&
+			$scrubcfg['if'] != 'l2tp'
+		) {
+			$mssclamp = "max-mss " . (intval($scrubcfg['mss'] - 40));
 		}
 
 		/* configure no-df for linux nfs and others */
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 479a69e7b..fa435be7f 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -351,7 +351,7 @@ function setup_serial_port($when = 'save', $path = '')
 		/* serial console - write out /boot/loader.conf */
 		if ($when == "upgrade")
 			system("echo \"Reading {$loader_conf_file}...\" >> /conf/upgrade_log.txt");
-		$boot_config = file_get_contents($loader_conf_file);
+		$boot_config = @file_get_contents($loader_conf_file);
 		$boot_config_split = explode("\n", $boot_config);
 		if(count($boot_config_split) > 0) {
 			$new_boot_config = array();