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

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index e1a82009452d629b0a092ac933c4a7f8946ea15d..eea2c01ace4abb2da7d563178c94bdd53b82e651 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/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;

diff --git a/lfs/fcron b/lfs/fcron
index 38343d4073ede643bf6504524f300625e9686603..d8fe8fbd9c4058716339bf0cdf86520d714bbe80 100644 (file)
--- a/lfs/fcron
+++ b/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)

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 55422143371ca7c3dc61ccbd4a6503671b4c14b8..9de3994cd3e354d7431e51b12c20b05e067837fe 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/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"

diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index ac835c5b9ececccdcad03dc9a161e94bb2855464..d61c3d5f0243d9551883c8c302334df5af480c23 100644 (file)
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/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