Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

src/initscripts/system/aws

@@ -34,7 +34,8 @@ case "${1}" in
 		running_on_ec2 || exit 0
 
 		# Find the first interface to use
-		for i in /sys/class/net/*; do
+		for i in /sys/class/net/red* /sys/class/net/eth* \
+				/sys/class/net/*; do
 			[ -d "${i}" ] || continue
 			i=$(basename ${i})
 

src/initscripts/system/unbound

@@ -197,8 +197,8 @@ write_forward_conf() {
 
 		local insecure_zones="${INSECURE_ZONES}"
 
-		local enabled zone server remark
-		while IFS="," read -r enabled zone server remark; do
+		local enabled zone server servers remark
+		while IFS="," read -r enabled zone servers remark; do
 			# Line must be enabled.
 			[ "${enabled}" = "on" ] || continue
 
@@ -215,7 +215,13 @@ write_forward_conf() {
 				*.in-addr.arpa)
 					echo "stub-zone:"
 					echo "	name: ${zone}"
-					echo "	stub-addr: ${server}"
+					for server in ${servers//|/ }; do
+						if [[ ${server} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+							echo "	stub-addr: ${server}"
+						else
+							echo "	stub-host: ${server}"
+						fi
+					done
 					echo
 					echo "server:"
 					echo "	local-zone: \"${zone}\" transparent"
@@ -224,7 +230,13 @@ write_forward_conf() {
 				*)
 					echo "forward-zone:"
 					echo "	name: ${zone}"
-					echo "	forward-addr: ${server}"
+					for server in ${servers//|/ }; do
+						if [[ ${server} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+							echo "	forward-addr: ${server}"
+						else
+							echo "	forward-host: ${server}"
+						fi
+					done
 					echo
 					;;
 			esac