diff options
| author | gnhb <gnoahb@gmail.com> | 2010-03-29 20:15:02 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-03-29 20:15:02 +0700 |
| commit | 68465fab8c4aeba39fcd793f208b667a1ebb4afc (patch) | |
| tree | 7b3407596e30fad5cec071b022e1049fcd315da8 /etc | |
| parent | c90f247117ace2af4e072e7004e1750875e568ff (diff) | |
| parent | 3da49dc3aed4571c0ae75a7a0680babe98be2ee5 (diff) | |
| download | pfsense-68465fab8c4aeba39fcd793f208b667a1ebb4afc.zip pfsense-68465fab8c4aeba39fcd793f208b667a1ebb4afc.tar.gz | |
Merge remote branch 'mainline/master'
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/gwlb.inc | 4 | ||||
| -rw-r--r-- | etc/inc/services.inc | 5 | ||||
| -rwxr-xr-x | etc/rc | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index e53673a..1b33cc1 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -150,14 +150,14 @@ EOD; $i = 2; foreach($gateways_arr as $name => $gateway) { /* for dynamic gateways without an IP address we subtitute a local one */ - if((is_numeric($gateway['attribute'])) && ($a_gateway_item[$gateway['attribute']]['monitor'] <> "")) { + if((is_numeric($gateway['attribute'])) && is_ipaddr($a_gateway_item[$gateway['attribute']]['monitor'])) { $gateway['monitor'] = $a_gateway_item[$gateway['attribute']]['monitor']; } else { if(($gateway['gateway'] == "dynamic") && ($gateway['monitor'])) { $gateway['monitor'] = "127.0.0.{$i}"; $i++; } - if($gateway['monitor'] == "") { + if(!is_ipaddr($gateway['monitor'])) { $gateway['monitor'] = $gateway['gateway']; } } diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 8bed47d..c98e746 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -43,7 +43,10 @@ function services_parse_dhcpd_hostnames() { // Launch if option enabled if (isset($config['dnsmasq']['regdhcp'])) { - mwexec("/bin/ln /etc/hosts {$g['varetc_path']}/hosts"); + /* Make sure we do not error out */ + @touch("{$g['dhcpd_chroot_path']}/var/db/dhcpd.leases"); + if (!file_exists("{$g['varetc_path']}/hosts")) + mwexec("/bin/ln /etc/hosts {$g['varetc_path']}/hosts"); if (file_exists("{$g['varrun_path']}/dhcpleases.pid")) sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "HUP"); else @@ -251,7 +251,7 @@ else /usr/sbin/fifolog_create -s 50688 /var/log/vpn.log /usr/sbin/fifolog_create -s 50688 /var/log/pptp.log /usr/sbin/fifolog_create -s 50688 /var/log/pppoe.log - /usr/sbin/fifolog_create -s 50688 /var/log/lt2p.log + /usr/sbin/fifolog_create -s 50688 /var/log/l2tp.log /usr/sbin/fifolog_create -s 50688 /var/log/openvpn.log /usr/sbin/fifolog_create -s 50688 /var/log/portalauth.log /usr/sbin/fifolog_create -s 50688 /var/log/ipsec.log @@ -266,7 +266,7 @@ else /usr/sbin/clog -i -s 65535 /var/log/vpn.log /usr/sbin/clog -i -s 50688 /var/log/pptp.log /usr/sbin/clog -i -s 50688 /var/log/pppoe.log - /usr/sbin/clog -i -s 50688 /var/log/lt2p.log + /usr/sbin/clog -i -s 50688 /var/log/l2tp.log /usr/sbin/clog -i -s 65535 /var/log/openvpn.log /usr/sbin/clog -i -s 65535 /var/log/portalauth.log /usr/sbin/clog -i -s 65535 /var/log/ipsec.log |
