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

html/cgi-bin/vpnmain.cgi

@@ -1351,7 +1351,7 @@ END
 	}
 
 	if ($cgiparams{'REMOTE'}) {
-	    if (! &General::validip($cgiparams{'REMOTE'})) {
+	    if (($cgiparams{'REMOTE'} ne '%any') && (! &General::validip($cgiparams{'REMOTE'}))) {
 		if (! &General::validfqdn ($cgiparams{'REMOTE'}))  {
 		    $errormessage = $Lang::tr{'invalid input for remote host/ip'};
 		    goto VPNCONF_ERROR;

lfs/fcron

@@ -102,6 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	echo "Place scripts run weekly here ..." > /etc/fcron.weekly/info.txt
 	echo "Place scripts run monthly here ..." > /etc/fcron.monthly/info.txt
 
+	chmod 640 /etc/fcron.{conf,allow,deny}
 	/usr/bin/fcrontab $(DIR_SRC)/config/cron/crontab
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

src/initscripts/init.d/network

@@ -31,6 +31,8 @@ init_networking() {
 	if [ -e /var/ipfire/main/disable_nf_sip ]; then
 		rmmod nf_nat_sip
 		rmmod nf_conntrack_sip
+		rmmod nf_nat_h323
+		rmmod nf_conntrack_h323
 	fi
 
 	boot_mesg "Setting up firewall"

src/initscripts/init.d/networking/dhcpcd.exe

@@ -39,7 +39,7 @@ dhcpcd_up()
 		fi
 
 		#Check if we have to restart the services at update
-		[ ! -e "/var/ipfire/red/active" ] update=1;
+		[ ! -e "/var/ipfire/red/active" ] && update=1;
 		if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then
 			update=1;
 		fi