Jim P
d685dad4d0
Merge pull request #5 from smos/master
...
Welcome IPv6!
2011-07-13 05:26:54 -07:00
Chris Buechler
0b07c7636f
fix missing "
2011-07-13 07:26:43 -04:00
Andrew Thompson
a213ad1891
Allow a ZMQ syslog address
2011-07-13 16:20:52 +12:00
jim-p
8b6313a4d3
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
etc/inc/easyrule.inc
etc/inc/filter.inc
etc/inc/interfaces.inc
etc/inc/services.inc
etc/inc/xmlrpc_client.inc
usr/local/www/fbegin.inc
usr/local/www/services_dhcp.php
2011-07-12 19:57:42 -04:00
Scott Ullrich
fd3e19f3bf
Create dynamodules in the order they where touched
2011-07-12 15:39:06 -04:00
Ermal
3994cc70cf
Do a more strict check on this to avoid warnings
2011-07-12 16:59:51 +00:00
Andrew Thompson
649ea752ce
Fix botched patch, add closing bracket
2011-07-12 16:08:22 +12:00
Andrew Thompson
aa9948147c
Allow DHCP mappings to be resolved first for reverse lookups.
...
This was affecting a kerberos installation where the first DNS alias was
given for the PTR instead of the static DHCP mapping name, breaking the
kerberos tokens.
2011-07-12 15:35:14 +12:00
Ermal
156ecb6435
Enable the pfsync checking unconditionally
2011-07-11 21:32:30 +00:00
Ermal
514f63d122
Put a netmask of /32 to all parameters of -k/-K/-b of pfctl to avoid any issues.
2011-07-11 21:05:35 +00:00
Ermal
2eb9c02f54
Actually give pfsync time to catch up.
2011-07-11 20:37:18 +00:00
Ermal
6930e805be
If the sync has not finished do not start carp yet
2011-07-11 20:27:25 +00:00
Vinicius Coque
3cfc695c36
Fix gettext
2011-07-11 09:58:06 -03:00
Vinicius Coque
0b93297284
Merge remote-tracking branch 'mainline/master' into inc
2011-07-11 09:52:26 -03:00
Ermal
bf17eb72c1
Fixes #1666 . For OpenVPN interfaces always check if part of bridge or not.
2011-07-11 12:41:24 +00:00
Vinicius Coque
fdbce60ca9
Merge remote-tracking branch 'mainline/master' into inc
2011-07-11 09:02:41 -03:00
Scott Ullrich
45d1024db3
Do not check to see if gateay falls within a null value. Resolves #1664
2011-07-10 12:04:34 -04:00
Scott Ullrich
7988ce7581
Do not check to see if gateay falls within a null value. Resolves #1664
2011-07-10 12:03:50 -04:00
Chris Buechler
f745b8ef21
fix text
2011-07-10 01:07:24 -04:00
Chris Buechler
5eeb1d9d27
fix text
2011-07-09 03:23:49 -04:00
Ermal
89bb7dcc4b
Ticket #1564 . Give +x to the script so it can be executed. Simple hah :)
2011-07-08 21:16:24 +00:00
Evgeny Yurchenko
5909b520a7
Bug #1639 . Port alias missing input validation in firewall_rules_edit.php.
2011-07-07 20:46:21 -04:00
Evgeny Yurchenko
9bc59815c6
Bug #1641 fix. DHCP server default gateway needs input validation.
2011-07-07 18:10:40 -04:00
jim-p
13b9dba9aa
Merge remote branch 'upstream/master'
2011-07-07 16:03:07 -04:00
jim-p
10f5d53cbf
Reconfigure wan/lan when finishing wizard, or the new IPs will not be applied.
2011-07-07 15:57:39 -04:00
Scott Ullrich
aa6798c070
$g needs to be a global. Resolves #1654
2011-07-07 15:16:30 -04:00
Vinicius Coque
fab60c5e0d
Merge remote-tracking branch 'mainline/master' into inc
2011-07-07 13:55:00 -03:00
Ermal
c13337f2ab
Actually do pass an argument for second -b to avoid matching more tha supposed too.
2011-07-06 21:40:35 +00:00
Ermal
66977fc7fb
Ticket #1646 . Put netmasks of /32 to the parameters of pfctl -b to avoid that ocassions it matches more than it should.
2011-07-06 21:19:53 +00:00
Ermal
8ed478973f
Kill states from the previous ip the link had on all mpd consumers. Resolves #1629
2011-07-06 20:50:03 +00:00
Ermal
5ffa33896f
Feature #1603 . Correct nested urltable alias code to be more fullproof to errors and does not break the ruleset on large lists of urltables. Though this needs a revisit to work properly since it breaks urltable alias property of reloading contents.
2011-07-06 18:52:47 +00:00
jim-p
590b8a38f5
Merge remote branch 'upstream/master'
2011-07-06 14:34:04 -04:00
jim-p
b34b2b7da2
Add function to return a certificate's common name.
2011-07-06 14:32:30 -04:00
jim-p
b8c372e516
Merge remote branch 'upstream/master'
2011-07-06 13:20:02 -04:00
jim-p
152f57596b
Fix test for tun device, -f fails because it's a char device, not a regular file. -e works.
2011-07-06 13:17:43 -04:00
jim-p
efa38d08e4
Merge remote branch 'upstream/master'
2011-07-06 11:49:01 -04:00
jim-p
9622da2659
Fix use post here, since the other var isn't defined as it was before my commit yesterday.
2011-07-06 11:47:45 -04:00
jim-p
5a4c0b5c7b
Merge remote branch 'upstream/master'
...
Conflicts:
etc/version
2011-07-06 09:41:28 -04:00
jim-p
54dd98320d
Fix select detection code for the RADIUS NAS IP. Fixes #1648
2011-07-06 09:35:06 -04:00
Vinicius Coque
1fbd187828
Implement gettext
2011-07-06 10:30:31 -03:00
Vinicius Coque
1623ed9700
Merge remote-tracking branch 'mainline/master' into inc
...
Conflicts:
etc/inc/priv.defs.inc
2011-07-06 09:41:50 -03:00
Warren Baker
f49c41c538
Spelling fix.
2011-07-06 12:58:16 +02:00
Scott Ullrich
76f5d95c71
Add issing include to avoid PHP fatal error when calling enable_rrd_graphing()
2011-07-05 16:28:12 -04:00
Ermal
f7ee0818bb
Add checks for miniupnpd to avoid php errors.
2011-07-05 20:20:28 +00:00
jim-p
8aafd58e46
Fix handling of interface selectors in packages.
2011-07-05 15:43:50 -04:00
Scott Ullrich
579f00da68
Make it HEAD since we already have builder code using this
2011-07-04 21:30:17 -04:00
Scott Ullrich
dc4106cf8d
Version bump master branch to MASTER
2011-07-04 21:29:03 -04:00
Scott Ullrich
088de6b1bd
Revert "Revert "Simplify message""
...
This reverts commit 6f38519561
2011-07-04 19:53:19 -04:00
Scott Ullrich
a9ee006d50
Revert "Revert "Add php errors (non warnings) to the crash reporter""
...
This reverts commit eac584f3b6
2011-07-04 19:53:17 -04:00
Scott Ullrich
eac584f3b6
Revert "Add php errors (non warnings) to the crash reporter"
...
This reverts commit cb61dad8ab
2011-07-04 19:39:28 -04:00
