diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-02-06 21:03:23 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-02-06 21:03:23 +0100 |
| commit | b32ccfce66dbb706c0661073725f2c30a9d646a8 (patch) | |
| tree | b859c7144d8e6014e20439df5b98d665d47a451b /etc | |
| parent | 3fc4a490effa9575dfc53d42739ee8fa1a4acd64 (diff) | |
| parent | 998930abd0f319cd662146f8073eb5909575150a (diff) | |
| download | pfsense-b32ccfce66dbb706c0661073725f2c30a9d646a8.zip pfsense-b32ccfce66dbb706c0661073725f2c30a9d646a8.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 11 | ||||
| -rw-r--r-- | etc/inc/openvpn.inc | 4 | ||||
| -rwxr-xr-x | etc/rc.bootup | 1 | ||||
| -rwxr-xr-x | etc/rc.filter_synchronize | 1 | ||||
| -rwxr-xr-x | etc/rc.newipsecdns | 3 |
5 files changed, 12 insertions, 8 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index f320531..fc3f734 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1264,11 +1264,14 @@ function filter_nat_rules_generate() { if(is_array($config['nat']['advancedoutbound']['rule'])) { foreach ($config['nat']['advancedoutbound']['rule'] as $obent) { update_filter_reload_status("Creating advanced outbound rule {$obent['descr']}"); - $src = $obent['source']['network']; - if(isset($obent['destination']['not']) && !isset($obent['destination']['any'])) - $dst = "!" . $obent['destination']['address']; - else + $src = alias_expand($obent['source']['network']); + if(!$src) + $src = $obent['source']['network']; + $dst = alias_expand($obent['destination']['address']); + if(!$dst) $dst = $obent['destination']['address']; + if(isset($obent['destination']['not']) && !isset($obent['destination']['any'])) + $dst = "!" . $dst; if(!$obent['interface']) $natif = "wan"; else diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 496b8bc..08e5f92 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -228,9 +228,9 @@ function openvpn_add_dhcpopts(& $settings, & $conf) { $conf .= "push \"dhcp-option DNS {$settings['dns_server4']}\"\n"; if (!empty($settings['ntp_server1'])) - $conf .= "push \"dhcp-option NTP {$settings['dhcp_ntp']}\"\n"; + $conf .= "push \"dhcp-option NTP {$settings['ntp_server1']}\"\n"; if (!empty($settings['ntp_server2'])) - $conf .= "push \"dhcp-option NTP {$settings['dhcp_ntp']}\"\n"; + $conf .= "push \"dhcp-option NTP {$settings['ntp_server2']}\"\n"; if ($settings['netbios_enable']) { diff --git a/etc/rc.bootup b/etc/rc.bootup index 3451c88..b6c8eab 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -390,6 +390,7 @@ if(file_exists('/conf/needs_package_sync')) { clear_subsystem_dirty('packagelock'); } } + @unlink('/conf/needs_package_sync'); } /* done */ diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 6a282cc..086a537 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -66,7 +66,6 @@ function backup_vip_config_section() { } if($section['advbase'] <> "") { $section_val = intval($section['advbase']); - $section_val=$section_val+1; if($section_val > 255) $section_val = 255; $section['advbase'] = $section_val; diff --git a/etc/rc.newipsecdns b/etc/rc.newipsecdns index 3061f16..c8fcabe 100755 --- a/etc/rc.newipsecdns +++ b/etc/rc.newipsecdns @@ -31,6 +31,7 @@ */ /* parse the configuration and include all functions used below */ + require_once("config.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); @@ -43,7 +44,7 @@ sleep(1); } - log_error("IPSEC: One or more IPSEC tunnel endpoints has changed IP. Refreshing."); + log_error("IPSEC: One or more IPsec tunnel endpoints has changed its IP. Refreshing."); /* We will walk the list of hostnames found in the ipsec tunnel * configuration. Since we are already triggered by filterdns * that a hostname has changed we can proceed to compare the |
