jim-p
cfcc69946c
CRL fixes for empty CRLs (so they don't kill OpenVPN)
2011-07-13 17:16:32 -04: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
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
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
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
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
Vinicius Coque
fab60c5e0d
Merge remote-tracking branch 'mainline/master' into inc
2011-07-07 13:55:00 -03: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
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
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
jim-p
8aafd58e46
Fix handling of interface selectors in packages.
2011-07-05 15:43:50 -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
Scott Ullrich
6f38519561
Revert "Simplify message"
...
This reverts commit 6608507d3b
2011-07-04 19:39:24 -04:00
Scott Ullrich
6608507d3b
Simplify message
2011-07-04 19:32:55 -04:00
Scott Ullrich
cb61dad8ab
Add php errors (non warnings) to the crash reporter
2011-07-04 19:30:25 -04:00
Scott Ullrich
88dadca1ba
Copy crash file to crash reporter directory if it exists
2011-07-04 19:26:40 -04:00
jim-p
769c4591ac
Merge remote-tracking branch 'upstream/master'
2011-07-04 11:11:11 -04:00
Evgeny Yurchenko
ae660b3ce7
Feature#1603. URL table aliases should be usable within network type aliases.
2011-07-03 03:18:23 -04:00
jim-p
dbaeaa79da
Merge remote-tracking branch 'upstream/master'
2011-07-02 21:37:52 -04:00
Scott Ullrich
9a15e394d1
Use product name for bsdlabel
2011-07-02 20:57:10 -04:00
Ermal
40fd50c8d0
Do not add an automatic gateway on openvpn tap case since its only the netmask.
2011-07-01 21:21:44 +00:00
jim-p
2488a7e73a
Merge remote branch 'upstream/master'
2011-07-01 11:38:20 -04:00
jim-p
0fcaf4f272
Unlock the fields when making a new internal cert, so we copy the data from the CA but are not locked into it. (Cert details often differ from CA details...)
2011-07-01 11:20:09 -04:00
Vinicius Coque
4842755397
Merge remote-tracking branch 'mainline/master' into inc
2011-06-28 16:55:51 -03:00
jim-p
38a481adc8
Add he.net tunnelbroker update dyndns type
2011-06-28 15:21:56 -04:00
Ermal
3cedb66fdb
Correctly display page title
2011-06-28 19:11:32 +00:00
jim-p
3062d6f7e4
Merge remote branch 'upstream/master'
2011-06-28 11:21:28 -04:00
jim-p
e8c8891d0c
Fix typo
2011-06-28 11:20:06 -04:00
Warren Baker
9ed6c9ac73
Make text cosmetics consistent and close off missing <span/> tag.
2011-06-28 16:22:49 +02:00
Warren Baker
03d7297b79
Use correct table header class.
2011-06-28 15:17:03 +02:00
Warren Baker
beaab62274
More text consistency.
2011-06-28 13:10:24 +02:00
Warren Baker
9338cf353e
Note consistency and gettext() added.
2011-06-28 12:59:01 +02:00
Warren Baker
48f55356be
Consistency of NOTE vs Note as through the rest of the webGUI.
2011-06-28 11:03:54 +02:00
Ermal
ca1a3fc230
Clean up leftover code not needed for anything.
2011-06-27 20:43:58 +00:00
