Merge branch 'master' of gitlab.netgate.com:pfsense/pfsense

src/etc/inc/upgrade_config.inc

@@ -5651,7 +5651,7 @@ function upgrade_181_to_182() {
 				}
 			}
 		}
-		if (count($newgroup4['item']) > 0) {
+		if (is_array($newgroup4['item']) && count($newgroup4['item']) > 0) {
 			$newname = "Default_Gateway_Group_ipv4";
 			if (gateway_or_gwgroup_exists($newname)) { //make sure we create a new name
 				$id = 2;
@@ -5666,7 +5666,7 @@ function upgrade_181_to_182() {
 			$config['gateways']['gateway_group'][] = $newgroup4;
 			$config['gateways']['defaultgw4'] = $newname;
 		}
-		if (count($newgroup6['item']) > 0) {
+		if (is_array($newgroup6['item']) && count($newgroup6['item']) > 0) {
 			$newname = "Default_Gateway_Group_ipv6";
 			if (gateway_or_gwgroup_exists($newname)) { //make sure we create a new name
 				$id = 2;

src/etc/phpshellsessions/gitsync

@@ -34,7 +34,7 @@ $GITSYNC_MERGE = "/root/.gitsync_merge";
 
 /* NOTE: Set branches here */
 $branches = array(
-	"master" => "2.4.3 development branch",
+	"master" => "2.4.5 development branch",
 	"build_commit" => "The commit originally used to build the image"
 );
 

src/etc/version

@@ -1 +1 @@
-2.4.4-DEVELOPMENT
+2.4.5-DEVELOPMENT

src/usr/local/www/interfaces.php

@@ -463,6 +463,11 @@ if ($_POST['apply']) {
 						services_dhcpd_configure();
 					}
 				}
+				/*
+				 * If the parent interface has changed above, the VLANs needs to be
+				 * redone.
+				 */
+				interfaces_vlan_configure();
 			}
 		}
 		/* restart snmp so that it binds to correct address */

src/usr/local/www/status.php

@@ -251,7 +251,7 @@ global $g, $config;
 
 /* OS stats/info */
 defCmdT("OS-Uptime", "/usr/bin/uptime");
-defCmdT("Network-Interfaces", "/sbin/ifconfig -a");
+defCmdT("Network-Interfaces", "/sbin/ifconfig -va");
 defCmdT("Network-Interface Statistics", "/usr/bin/netstat -nWi");
 defCmdT("Process-Top Usage", "/usr/bin/top | /usr/bin/head -n5");
 defCmdT("Process-List", "/bin/ps xauwwd");

src/usr/local/www/status_gateway_groups.php

@@ -35,10 +35,7 @@ define('COLOR', true);
 
 require_once("guiconfig.inc");
 
-if (!is_array($config['gateways']['gateway_group'])) {
-	$config['gateways']['gateway_group'] = array();
-}
-
+init_config_arr(array('gateways', 'gateway_group'));
 $a_gateway_groups = &$config['gateways']['gateway_group'];
 $changedesc = gettext("Gateway Groups") . ": ";
 

src/usr/local/www/vpn_ipsec_phase2.php

@@ -172,6 +172,11 @@ if ($_POST['save']) {
 					$input_errors[] = gettext("An IPv6 local address was specified but the mode is not set to tunnel6");
 				}
 				break;
+			default:
+				if (($pconfig['mode'] == "vti") && !is_ipaddr($pconfig['localid_address'])) {
+					$input_errors[] = gettext("VTI requires a valid local network or IP address for its endpoint address, it cannot use a network macro for a different interface (e.g. LAN).");
+				}
+
 		}
 		/* Check if the localid_type is an interface, to confirm if it has a valid subnet. */
 		if (is_array($config['interfaces'][$pconfig['localid_type']])) {
@@ -238,6 +243,10 @@ if ($_POST['save']) {
 	/* Validate enabled phase2's are not duplicates */
 	if (isset($pconfig['mobile'])) {
 		/* User is adding phase 2 for mobile phase1 */
+		if ($pconfig['mode'] == "vti") {
+			$input_errors[] = gettext("VTI is not compatible with mobile IPsec.");
+		}
+
 		foreach ($a_phase2 as $key => $name) {
 			if (isset($name['mobile']) && $name['uniqid'] != $pconfig['uniqid']) {
 				/* check duplicate localids only for mobile clents */

src/usr/local/www/xmlrpc.php

@@ -33,6 +33,7 @@ require_once("auth.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
+require_once("captiveportal.inc");
 require_once("shaper.inc");
 require_once("XML/RPC2/Server.php");
 
@@ -183,7 +184,7 @@ class pfsense_xmlrpc_server {
 	public function restore_config_section($sections) {
 		$this->auth();
 
-		global $config;
+		global $config, $cpzone, $cpzoneid;
 
 		$old_config = $config;
 		$old_ipsec_enabled = ipsec_enabled();
@@ -227,6 +228,22 @@ class pfsense_xmlrpc_server {
 			$syncd_full_sections[] = $section;
 		}
 
+		/* Create a list of CP zones to be deleted locally */
+		$cp_to_del = array();
+		if (is_array($config['captiveportal'])) {
+			if (is_array($sections['captiveportal'])) {
+				$remote_cp = $sections['captiveportal'];
+			} else {
+				$remote_cp = array();
+			}
+			foreach ($config['captiveportal'] as $zone => $item) {
+				if (!isset($remote_cp[$zone])) {
+					$cp_to_del[] = $zone;
+				}
+			}
+			unset($remote_cp);
+		}
+
 		/* Only touch users if users are set to synchronize from the primary node
 		 * See https://redmine.pfsense.org/issues/8450
 		 */
@@ -382,17 +399,24 @@ class pfsense_xmlrpc_server {
 		/* For vip section, first keep items sent from the master */
 		$config = array_merge_recursive_unique($config, $sections);
 
+		/* Remove local CP zones removed remote */
+		foreach ($cp_to_del as $zone) {
+			$cpzone = $zone;
+			$cpzoneid = $config['captiveportal'][$cpzone]['zoneid'];
+			unset($config['captiveportal'][$cpzone]['enable']);
+			captiveportal_configure_zone(
+			    $config['captiveportal'][$cpzone]);
+			unset($config['captiveportal'][$cpzone]);
+			if (isset($config['voucher'][$cpzone])) {
+				unset($config['voucher'][$cpzone]);
+			}
+		}
+
 		/* Remove locally items removed remote */
 		foreach ($voucher as $zone => $item) {
-			/* Zone was deleted on master, delete its vouchers */
-			if (!isset($config['captiveportal'][$zone])) {
-				unset($config['voucher'][$zone]);
-				continue;
-			}
 			/* No rolls on master, delete local ones */
 			if (!is_array($item['roll'])) {
 				unset($config['voucher'][$zone]['roll']);
-				continue;
 			}
 		}
 
@@ -573,7 +597,7 @@ class pfsense_xmlrpc_server {
 		unset($old_config);
 
 		local_sync_accounts($u2add, $u2del, $g2add, $g2del);
-		filter_configure(false);
+		$this->filter_configure(false);
 
 		return true;
 	}
@@ -687,6 +711,8 @@ class pfsense_xmlrpc_server {
 			local_reset_accounts();
 		}
 
+		captiveportal_configure();
+
 		return true;
 	}
 

tools/builder_defaults.sh

@@ -135,7 +135,7 @@ export KERNEL_BUILD_PATH=${KERNEL_BUILD_PATH:-"${SCRATCHDIR}/kernels"}
 # Do not touch builder /usr/obj
 export MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX:-"${SCRATCHDIR}/obj"}
 
-export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"aesni amdtemp coretemp cryptodev cpuctl drm2 fdescfs dummynet hwpmc i2c if_stf ipdivert ipfw ipmi ix ixv ndis nmdm opensolaris sfxge vmm zfs"}
+export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"aesni amdtemp amdsmn coretemp cryptodev cpuctl drm2 fdescfs dummynet hwpmc i2c if_stf ipdivert ipfw ipmi ix ixv ndis nmdm opensolaris sfxge vmm zfs"}
 
 # gnid
 export GNID_REPO_BASE=${GNID_REPO_BASE:-"${GIT_REPO_BASE}/gnid.git"}

tools/conf/pfPorts/make.conf

@@ -1,6 +1,6 @@
 # Define pfSense repos
 PFSENSE_REPOS=	pfSense-repo pfSense-repo-devel pfSense-repo-legacy-devel-23 \
-		pfSense-repo-legacy-23
+		pfSense-repo-legacy-23 pfSense-repo-244
 
 # Generic options
 OPTIONS_UNSET_FORCE=	X11 DOCS EXAMPLES MAN INFO MANPAGES

tools/templates/pkg_repos/pfSense-repo-244.abi

@@ -0,0 +1 @@
+FreeBSD:11:%%ARCH%%

tools/templates/pkg_repos/pfSense-repo-244.altabi

@@ -0,0 +1 @@
+freebsd:11:%%ARCH%%

tools/templates/pkg_repos/pfSense-repo-244.conf

@@ -0,0 +1,17 @@
+FreeBSD: { enabled: no }
+
+%%PRODUCT_NAME%%-core: {
+  url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_4_4_%%ARCH%%-core",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg",
+  enabled: yes
+}
+
+%%PRODUCT_NAME%%: {
+  url: "%%PKG_REPO_SERVER_RELEASE%%/%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_4_4_%%ARCH%%-%%PRODUCT_NAME%%_%%REPO_BRANCH_PREFIX%%v2_4_4",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/local/share/%%PRODUCT_NAME%%/keys/pkg",
+  enabled: yes
+}

tools/templates/pkg_repos/pfSense-repo-244.descr

@@ -0,0 +1 @@
+Next Release Candidate (2.4.4-RC)