Merge remote branch 'upstream/master'

etc/inc/config.lib.inc

@@ -479,8 +479,12 @@ function write_config($desc="Unknown", $backup = true) {
 	 *       for now, since it was preventing config saving. */
 	// $config = parse_config(true, false, false);
 	
+	/* Comment this check out for now. There aren't any current issues that
+	 *   make this problematic, and it makes users think there is a problem
+	 *   when one doesn't really exist.
 	if($g['booting'])
 		log_error("WARNING! Configuration written on bootup.  This can cause stray openvpn and load balancing items in config.xml");
+	*/
 
 	$username = empty($_SESSION["Username"]) ? "(system)" : $_SESSION['Username'];
 

etc/inc/filter.inc

@@ -2294,6 +2294,15 @@ pass in on \${$oc['descr']} proto udp from any port = 68 to {$oc['ip']} port = 6
 pass out on \${$oc['descr']} proto udp from {$oc['ip']} port = 67 to any port = 68 label "allow access to DHCP server"
 
 EOD;
+				if($config['dhcpd'][$on]['failover_peerip'] <> "") {
+					$ipfrules .= <<<EOD
+# allow access to DHCP failover on {$oc['descr']} from {$config['dhcpd'][$on]['failover_peerip']}
+pass in on \${$oc['descr']} proto udp from {$config['dhcpd'][$on]['failover_peerip']} to {$oc['ip']} port = 519 label "allow access to DHCP failover"
+pass in on \${$oc['descr']} proto udp from {$config['dhcpd'][$on]['failover_peerip']} to {$oc['ip']} port = 520 label "allow access to DHCP failover"
+
+EOD;
+				}
+
 			}
 			if(isset($config['dhcpdv6'][$on]['enable'])) {
 				$ipfrules .= <<<EOD

etc/inc/upgrade_config.inc

@@ -2206,18 +2206,16 @@ function upgrade_069_to_070() {
 
 	/* Convert NAT 1:1 rules */
 	if (is_array($config['nat']['onetoone'])) {
-		$a_nat = &$config['nat']['onetoone'];
-
-		foreach ($a_nat as &$natent) {
+		foreach ($config['nat']['onetoone'] as $nidx => $natent) {
 			if ($natent['subnet'] == 32)
-				$natent['source'] = array("address" => $natent['internal']);
+				$config['nat']['onetoone'][$nidx]['source'] = array("address" => $natent['internal']);
 			else
-				$natent['source'] = array("address" => $natent['internal'] . "/" . $natent['subnet']);
+				$config['nat']['onetoone'][$nidx]['source'] = array("address" => $natent['internal'] . "/" . $natent['subnet']);
 
-			$natent['destination'] = array("any" => true);
+			$config['nat']['onetoone'][$nidx]['destination'] = array("any" => true);
 
-			unset($natent['internal']);
-			unset($natent['subnet']);
+			unset($config['nat']['onetoone'][$nidx]['internal']);
+			unset($config['nat']['onetoone'][$nidx]['subnet']);
 		}
 
 		unset($natent);

etc/version

@@ -1 +1 @@
-2.0-BEAT5
+2.0-BETA5

usr/local/www/diag_packet_capture.php

@@ -117,8 +117,18 @@ include("fbegin.inc");
 				<select name="interface">
 <?php 
 					$interfaces = get_configured_interface_with_descr();
-					foreach ($interfaces as $iface => $ifacename): 
-?>
+					if (isset($config['ipsec']['enable']))
+						$interfaces['ipsec'] = "IPsec";
+					foreach (array('server', 'client') as $mode) {
+						if (is_array($config['openvpn']["openvpn-{$mode}"])) {
+							foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) {
+								if (!isset($setting['disable'])) {
+									$interfaces['ovpn' . substr($mode, 0, 1) . $setting['vpnid']] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
+								}
+							}
+						}
+					}
+					foreach ($interfaces as $iface => $ifacename): ?>
                       <option value="<?=$iface;?>" <?php if ($selectedif == $iface) echo "selected"; ?>>
                       <?php echo $ifacename;?>
                       </option>

usr/local/www/diag_smart.php

@@ -256,7 +256,7 @@ switch($action)
 	default:
 	{
 		// Get all AD* and DA* (IDE and SCSI) devices currently installed and stores them in the $devs array
-		exec("ls /dev | grep '^[ad][da]*[0-9]$'", $devs);
+		exec("ls /dev | grep '^[ad][da][0-9]\{1,2\}$'", $devs);
 		?>
 		<table width="100%" border="0" cellpadding="0" cellspacing="0">
 			<tr>

usr/local/www/status_filter_reload.php

@@ -50,12 +50,12 @@ if($_GET['getstatus']) {
 	echo "|{$status}|";
 	exit;
 }
-if($_GET['reloadfilter']) {
+if($_POST['reloadfilter']) {
 	send_event("filter reload");
 	header("Location: status_filter_reload.php");
 	exit;
 }
-if($_GET['syncfilter']) {
+if($_POST['syncfilter']) {
 	send_event("filter sync");
 	header("Location: status_filter_reload.php");
 	exit;
@@ -68,11 +68,13 @@ include("head.inc");
 
 <?php include("fbegin.inc"); ?>
 <br/>
-<a href="/status_filter_reload.php?reloadfilter=true"><input type="button" value="Reload Filter" id="reloadfilter"></a>
+<form action="status_filter_reload.php" method="POST" name="filter">
+<input type="submit" value="Reload Filter" name="reloadfilter" id="reloadfilter">
 <?php if (is_array($config["installedpackages"]["carpsettings"]["config"][0]) && $config["installedpackages"]["carpsettings"]["config"][0]["pfsyncpeerip"] != ""): ?>
 &nbsp;&nbsp;&nbsp;&nbsp;
-<a href="/status_filter_reload.php?syncfilter=true"><input type="button" value="Force Config Sync" id="syncfilter"></a>
+<input type="submit" value="Force Config Sync" name="syncfilter" id="syncfilter">
 <? endif; ?>
+</form>
 <br/><br/><br/>
 <div id="status" name="status" style="padding:5px; border:1px dashed #990000; background-color: #ffffff; color: #000000;">
 	<?php echo $status; ?>

usr/local/www/system_firmware_settings.php

@@ -157,11 +157,11 @@ function enable_altfirmwareurl(enable_over) {
 		<td colspan="2" valign="top" class="listtopic"><?=gettext("Updates"); ?></td>
 	</tr>
 	<tr>
-		<td width="22%" valign="top" class="vncell"><?=gettext("Not signed images."); ?></td>
+		<td width="22%" valign="top" class="vncell"><?=gettext("Unsigned images"); ?></td>
 		<td width="78%" class="vtable">
 			<input name="allowinvalidsig" type="checkbox" id="allowinvalidsig" value="yes" <?php if (isset($curcfg['allowinvalidsig'])) echo "checked"; ?> />
 			<br />
-			<?=gettext("Allow updating the system with auto-updater and images with no signature."); ?>
+			<?=gettext("Allow auto-update firmware images with a missing or invalid digital signature to be used."); ?>
 		</td>
 	</tr>
 <?php if(file_exists("/usr/local/bin/git")): ?>