mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,384 Commits 27 Branches 53 Tags 494 MiB
88165371ef
Commit Graph

9756 Commits

Author SHA1 Message Date
Scott Ullrich
c1605b3565 Add restore full backup tab 2011-09-25 19:19:08 -04:00
Scott Ullrich
a30afe0e59 Add checkbox to invoke full backup prior to upgrade 2011-09-25 17:57:11 -04:00
Scott Ullrich
b2a67b558c Add option to perform full backup prior to upgrade. First commit of 2011 pfSense hackathon! 2011-09-25 17:01:03 -04:00
smos
0c13b5f6aa Correct typo, fixes Ticket #1892 2011-09-22 12:52:08 +02:00
jim-p
9c070452ce Fix interface finding. Now properly adds a dhcpv6 static mapping via + button. 2011-09-21 16:32:43 -04:00
jim-p
9fbefc09a5 Fix type detection 2011-09-21 16:22:30 -04:00
jim-p
9d539cb5b8 Fix misnomer since the page was copied from dhcpv4, change references to arp to ndp instead. 2011-09-21 16:16:11 -04:00
jim-p
4e85523b25 Speed up display of static dhcpv6 leases by skipping an additional ndp exec for each entry, use the existing arpdata array instead. 2011-09-21 16:14:17 -04:00
jim-p
4151bdba8c Fix display of static dhcpv6 assignments. Format duid with colons. 2011-09-21 15:49:17 -04:00
smos
eb26eb1cdf Commit a fix that prevents the drop down from showing over 31 length. 
Fixes Ticket #1892
 2011-09-21 19:08:39 +02:00
jim-p
2fdc826253 Show MAC address on DHCPv6 output. (Not that it's used in the same way for DHCPv6 as it is for v4, but it's handy to see in one place) 2011-09-21 14:04:56 -04:00
jim-p
dcd8132214 For DHCPv6 the CLTT (client last transaction time) is used instead of the "start" time for the lease. Should now more accurately display when a lease started. 2011-09-21 13:42:07 -04:00
Ermal
f0be376863 Bind the state killing to the interface they should kill the states so that it does not impact other services like in #1421 2011-09-20 20:11:13 +00:00
jim-p
f393a514f2 Split the IAID off in the output, interpret the result. (Matches up with what shows in output from client) 2011-09-20 14:57:12 -04:00
jim-p
b63b969117 Remove 0x, really isn't needed 2011-09-20 14:21:13 -04:00
jim-p
a4dd274beb Improve duid parsing. Still some work to be done but should avoid the infinite loop it hit in some cases previously. 2011-09-20 14:18:40 -04:00
Ermal
21b8289eb8 Properly dispaly CP status page with the multi instance CP 2011-09-17 15:52:47 +00:00
Ermal
0380704f81 To avoid any possible issues during the different paths of the workflow create the zone since its first step 2011-09-15 19:28:25 +00:00
Ermal
0dad12d86c Do not try to add mac passthrough to a not loaded ipfw since the macs might be added to the wrong zone. 2011-09-15 19:23:46 +00:00
Ermal
90477318aa Fixes #1874. Correctly error out when the user or the pass is not posted during login of CP. 2011-09-13 19:30:07 +00:00
jim-p
2100a4542e Check if a widget is null before testing a property. Fixes skipped updates on certain widgets (like the gateway widget) if someone doesn't have the cpu widget file on their fs (which a clean install does not). 2011-09-13 13:57:47 -04:00
jim-p
d3ce6a8be3 Revert "Another try at prventing panic on reconfig of ppp type wans. Ticket #1696" 
This reverts commit afe88d6923.
 2011-09-12 19:20:13 -04:00
jim-p
b8c8820bd1 Revert "Be correct on teh variable scope" 
This reverts commit 106646b420.
 2011-09-12 19:20:08 -04:00
Ermal
106646b420 Be correct on teh variable scope 2011-09-12 22:35:47 +00:00
Ermal
afe88d6923 Another try at prventing panic on reconfig of ppp type wans. Ticket #1696 2011-09-12 22:30:52 +00:00
jim-p
8678130da6 If we are coming from a PPPoE/PPTP WAN type, grab the old physical interface first to avoid assigning a ppp interface to itself. Fixes pppoe->pppoe wizard run as well as changing pppoe->dhcp. Fixes #1696 2011-09-12 17:06:51 -04:00
jim-p
3a11fef2b0 Check in intel license files, required for compliance. The copy.list alone wasn't grabbing them. 2011-09-12 16:05:55 -04:00
Scott Ullrich
108c6dbc58 Add no cache header 2011-09-12 15:32:56 -04:00
Ermal
43d8f1cc9c Fixes #1696. Do not store temporary information under interfaces section during wizards since this might generate a message to netgraph that triggers a panic. 2011-09-12 12:05:11 +00:00
jim-p
ae0023beea Don't try to unset this variable if it isn't set to begin with. Fixes #1865 2011-09-09 11:16:36 -04:00
Chris Buechler
65319e4cac fix firewall_nat_out to not auto-generate outbound NAT rules with one too many IPs 2011-09-09 04:40:28 -04:00
Warren Baker
21c160361d Move filter box up to the top, so it is more easily accessible 2011-09-08 12:29:57 +02:00
Ermal
5077970883 Correct check 2011-09-07 20:18:46 +00:00
Ermal
ebc0e4b6fd Add support for multiple radius server to be used during authentication 2011-09-07 19:59:56 +00:00
Ermal
b4792bf8fe Add the multi instance CP to master branch. This allows to define CP with different properties on different interfaces. 2011-09-07 13:04:01 +00:00
smos
9b55203f87 Show the hexadecimal value of the integer for readability 2011-09-07 13:06:57 +02:00
jim-p
fce938b3a3 Match pftop page exatly with privilege, there is no other page that glob would catch. Fixes #1845 2011-09-06 18:37:35 -04:00
jim-p
f8707b1537 Also show queues on limiter info page, so that the child queues of limiter pipes can be viewed. (See ticket #1843) 2011-09-06 13:29:56 -04:00
smos
520c3d614d Remove the gateway field from view since it is not a valid option for now. 2011-09-03 19:48:45 +02:00
smos
8fb12535b7 Add empty dhcp6c client control socket file 2011-09-01 13:16:15 +02:00
jim-p
360ed9fa24 Avoid a blank trailing entry 2011-08-30 16:34:14 -04:00
jim-p
40af551fe5 Have Diag>DNS pull servers from /etc/resolv.conf instead of the config, so it reflects all of the servers in use for the speed report. 2011-08-30 16:32:12 -04:00
jim-p
d89fdda0f2 Add a note to the server Load Balancer page to let users know it's not for Multi-WAN. 2011-08-30 16:04:34 -04:00
Warren Baker
96beb23dd4 Wording fix to better describe the Translation address. 2011-08-30 21:48:05 +02:00
jim-p
badc234035 Fix bottom note when viewing Floating rules to better reflect how they operate. 2011-08-30 15:30:10 -04:00
jim-p
bde9fd2199 Fix note width for 1:1 NAT 2011-08-30 15:16:31 -04:00
jim-p
abc16ee65e Fix QinQ note width. 2011-08-30 15:00:13 -04:00
jim-p
944b694663 Clarify text 2011-08-30 14:50:17 -04:00
jim-p
c61ed3db61 Clarify text 2011-08-30 14:23:42 -04:00
jim-p
5a8a754578 Clarify notes so people don't think they need to disable pf to disable NAT. 2011-08-30 14:07:14 -04:00
jim-p
8ca95ed86f Move the option to exclude localhost as a DNS server under System > General so it is grouped with other system DNS options in a more logical location. 2011-08-30 13:32:36 -04:00
jim-p
973444a8dd Sync note for "server address" between PPTP/PPPoE/L2TP for consistency. 2011-08-30 13:20:31 -04:00
jim-p
546a3db193 Add some help links for pages that were missing. 2011-08-30 13:07:26 -04:00
jim-p
7a21d1b8d9 Change mbuf output on dashboard to read total/max, instead of current/total, to give a more useful view. Also only use a single netstat command instead of two. 2011-08-30 12:54:29 -04:00
Ermal
b094340954 Fix several issues in pppoe code and remove duplicated code. 2011-08-30 16:11:40 +00:00
jim-p
453d9c96dd Fixup OpenVPN status a bit to properly handle SSL servers using a /30 (no server directive) and also be a little more verbose about what is happening, if we can tell. 2011-08-30 09:48:20 -04:00
Scott Ullrich
f670f0a27a Unlink last msg cache for growl when sending test messagws 2011-08-29 18:43:38 -04:00
Warren Baker
edf1c0d918 Give the Layer7 patterns page some much needed love. 2011-08-29 16:04:56 +02:00
Seth Mos
1eca1a2fe8 Add DHCPv6 relay pages for the DHCPv6 relay. Ticket #1663 2011-08-29 10:33:34 +02:00
Seth Mos
47fc7453a0 Correct the link for EasyRule so that IPv6 addresses parse 2011-08-29 10:16:48 +02:00
Seth Mos
96bddaf35a Add IPv6 love to diag states Summary. For Ticket #1816 2011-08-29 09:59:04 +02:00
Seth Mos
181816f190 Reflect the dynamic(6) gateway naming change in interfaces.php too 2011-08-29 09:14:34 +02:00
Scott Ullrich
8d29f477a2 Merge pull request #10 from namezero111111/patch-2 
Added web interface capability to make the LDAP search more specific in o
 2011-08-28 10:17:52 -07:00
Scott Ullrich
3dd2a27826 Log when XMLRPC auth fails so that the brute force lockout will kick in. 2011-08-28 13:06:42 -04:00
namezero111111
c7073ebf51 Added web interface capability to make the LDAP search more specific in order to filter for group membership for example. 2011-08-28 05:43:39 +03:00
Nachtfalkeaw
a574b9607d Add default values for latency, packet loss, down on GUI 2011-08-28 06:41:20 +03:00
jim-p
107f0cc8ce Add a couple more mobile browser detection strings (BlackBerry, Opera Mini/Mobi) 2011-08-25 09:17:17 -04:00
Chris Buechler
ace9a95466 fix text 2011-08-24 21:54:48 -04:00
Seth Mos
99bdb17e39 Unbreak the firewall rule Edit page, input error array was unset halfway the validation. Set that back up ontop. 
Add gateway validation
 2011-08-24 22:10:55 +02:00
Seth Mos
4108dee880 Catch another possiblity for invalid rule generation 2011-08-24 21:21:56 +02:00
jim-p
197c30ae98 Make sure this does not operate on empty parameters, and also log when removing states. 2011-08-24 12:59:13 -04:00
Seth Mos
a1c10b7fbf Properly fix the address family check for gateway groups Ticket #1659 2011-08-24 15:26:20 +02:00
Seth Mos
8c591d01db Unbreak firewall rules edit, missing a ) 2011-08-24 15:12:05 +02:00
Seth Mos
16b03b7985 Fix a typo in the subnet generation causing the code to fail 2011-08-24 15:07:05 +02:00
Seth Mos
fcb816d9d0 Only show gateways from the same address family on the groups edit page. Ticket #1659 2011-08-24 14:31:06 +02:00
Warren Baker
6fd35fe340 These html tags are not required since they are used in head.inc which is included. 2011-08-24 14:04:02 +02:00
Seth Mos
270a257646 Add address family validation, also hide gateways or gateway groups from the gateway list. 
Fix Ticket #1659
 2011-08-24 13:02:34 +02:00
Seth Mos
9e80d14cab Add address family input validation on the Gateways edit page, also prevent adding gateways on interfaces that do not carry that address family. 
Fix Ticket #1633
 2011-08-24 12:42:16 +02:00
Seth Mos
bb5a2d0e72 Automatically adjust the subnet size drop down when editing a entry 
Ticket #1661
 2011-08-24 11:40:14 +02:00
Seth Mos
1831a00d46 Add Address Family input validation on the system routes edit page. Do not allow IPv4 subnet masks > 32 bits. 
Ticket #1661
 2011-08-24 11:36:06 +02:00
Seth Mos
9d8ee15bcc Fix the address family check to skip empty DNS gateway fieldS 2011-08-24 10:47:28 +02:00
Seth Mos
d623f2da17 Change the DNS interface code to DNS gateway code. This will need upgrade code for existing configs. 2011-08-24 10:29:04 +02:00
jim-p
28ce79ad04 Simplify this code a bit, should be the same test in both locations since this should be either/or, and with the other code it can apparently fall into a trap where it shows neither. 2011-08-23 16:36:23 -04:00
jim-p
b4eec6e60a Fix field name label. 2011-08-22 08:37:08 -04:00
Chris Buechler
dba5f621c2 un-break services_dhcpv6.php 2011-08-21 23:56:10 -04:00
smos
fd1e6c05c0 Clarify advertising options, add router only type. 2011-08-21 17:11:40 +02:00
smos
ac0057675a Fix the redirect URL for IPv6 addresses Ticket #1583 2011-08-21 13:36:07 +02:00
smos
385ed7d0a7 Make sure to set the $pconfig prefix delegation setting from the config. 2011-08-21 10:50:09 +02:00
jim-p
6f75aab23a Fix mismatched curly brace 2011-08-20 09:28:53 -04:00
Chris Buechler
1caa6adc42 remove dead link, no equivalent exists, will add info on that page's help 2011-08-20 01:37:17 -04:00
smos
6d063da352 Calculate the possible subnet ids from the delegated prefix length for the dropdown 2011-08-18 13:47:58 +02:00
smos
12de53a8fa Remove the gateway check here and always show the prefix delegation ID. Alternative we should consider a dhcp-pd type for the interface v6 address. Using a FE80::1 as the interface address for now. 2011-08-18 09:19:56 +02:00
Chris Buechler
2a5d416d8f fix text 2011-08-17 22:28:11 -04:00
jim-p
8e95a671fa Include the rate output in the privilege for the traffic graph. 2011-08-17 13:14:17 -04:00
Ermal
4bd491a3e3 Comment out code that seems to not be anymore useful. Remove later on if no complaints in sight. 2011-08-17 09:02:18 +00:00
Andrew Thompson
7734aea648 Make initial changes to allow pfSense to work in a jail. 
This mostly avoids starting things that will not work and gets the
initial config. Most of the pfSense functionality will not work
(pf rules, routing, etc) but it can be used for testing.
 2011-08-17 14:15:18 +12:00
Andrew Thompson
8f9bffbc98 Allow custom dnsmasq options so ppl can set SRV records and such for xmpp/kerberos 2011-08-17 10:02:11 +12:00
smos
1e37f324ad Unbreak interfaces.php 2011-08-15 20:22:37 +02:00
Seth Mos
20b49b1711 Fix a typo that caused stripping of the v4 config 2011-08-15 15:54:14 +02:00
Seth Mos
e029943a10 Split the IPv4 and IPv6 configuration out into 2 seperate drop downs. 2011-08-15 14:15:25 +02:00
Ermal
6c86a39f8e Allow disabling having localhost in resolv.conf. There are some special setups that might need this. 2011-08-12 11:47:12 +00:00
jim-p
adacdf5f45 Populate pconfig in all cases with user info, or else when you delete a privilege, the list disappears until you go back and edit the user again. (Certs too) 2011-08-11 14:03:12 -04:00
jim-p
3f1097004e Sort user privileges so dashboard/index.php come first, so if a user has those permissions, they get redirected there first and not to another page. 2011-08-11 14:02:21 -04:00
jim-p
675b5fa637 Make this box much bigger, it's hard to find things in the tiny window with a long list. 2011-08-10 11:04:52 -04:00
Ermal
d78df7b98c Make the checks during step4 and step5 actually work. 2011-08-09 21:00:50 +00:00
jim-p
b48b79c2e5 Show the CP User count in the page title, as on 1.2.3. 2011-08-08 09:37:13 -04:00
jim-p
8a85ab907d Apparently RFC 1123 overrides RFC 952 and hostnames can start with digits these days. 2011-08-06 21:20:58 -04:00
jim-p
5b0f2653ba Remove GUI code to enable fast routing. The backend code was removed back in December in 4f76b144b0 2011-08-05 10:20:27 -04:00
jim-p
c5ce839829 Work around the fact that get_configured_interface_list re-parses the config and kills the reference made before it, which was making it impossible to delete a pppoe instance. 2011-08-03 12:38:47 -04:00
Ermal
b0d088eb6f Correctly check the values for VoIP on multi_lan traffic shaper wizard. Reported-by: http://forum.pfsense.org/index.php/topic,32833.15.html. Ticket #1728 2011-08-02 21:17:30 +00:00
Ermal
ea858be08a Correct the link to index.php so it always works correctly. 2011-08-02 20:31:51 +00:00
jim-p
233e2af1f4 If no pppoe service name is configured, send a null service name. Seems to help clients especially when reconnecting. 2011-08-02 15:59:11 -04:00
Ermal
eea89a5c1b Declare the arrays as global since that is what they are. Correct the name of asterisk in the global defniition. 2011-08-02 08:00:13 +00:00
Ermal
b3795cb988 Correct battlenet data to not be overriden. Reported-by: http://forum.pfsense.org/index.php/topic,39176.0.html 2011-08-02 07:47:33 +00:00
Chris Buechler
738000134b fix text 2011-07-29 03:17:36 -04:00
Chris Buechler
32363c2efd Merge branch 'master' of github.com:bsdperimeter/pfsense 2011-07-29 03:14:58 -04:00
Ermal
f720398561 Add an override for default interval to send icmp 2011-07-28 20:56:38 +00:00
jim-p
6d1ae23c9e Clarify notes for pptp "Server address" 2011-07-28 16:45:13 -04:00
Ermal
db07cc25af Fix status page of gateways to show gateways with monitoring disabled as up. 2011-07-28 20:35:16 +00:00
Ermal
33c06ef791 Add a new option to allow disabling of gateway monitoring. This gateways will always be reported as up. 2011-07-28 20:31:57 +00:00
Ermal
e151744e90 Just break states based on the remote host ip and not with localip. The later might be the same as address used by other services and might interrupt them 2011-07-28 19:35:13 +00:00
jim-p
778772383b Move the textarea displaying packet capture outside of the form tag, or else a browser will try to submit the contents of the textarea when hitting a button. If you were viewing a large capture, that can be quite a long time it's wasting on uploading data that serves no purpose. 2011-07-28 14:33:13 -04:00
jim-p
89fae3e74c Fix whitespace formatting 2011-07-28 14:33:05 -04:00
jim-p
d3347fdf2b Fix display of ssh port on anti-lockout rule display in GUI. 2011-07-28 14:24:46 -04:00
Ermal
1f33a7128b Correct priority number to not have clashes with PRIQ which do not allow same priority numbers for two different queues. 2011-07-28 08:17:01 +00:00
Scott Ullrich
b22bf161fd Adding hook 2011-07-27 19:24:01 -04:00
Scott Ullrich
439cc13f26 Add hooks 2011-07-27 19:03:48 -04:00
Ermal
9626710723 Correct whitespace and some problems in the just merged ldap auth sorce for racoon 2011-07-27 20:31:30 +00:00
Ermal Luçi
5d6bade495 Merge pull request #8 from ninja76/master 
IPSec xAuth allowing LDAP to be used as a backend
 2011-07-27 13:19:14 -07:00
Bryan Haase
f9199cd3ac Check for null Array and move option system to top 2011-07-27 14:41:55 -05:00
jim-p
4cf82d5294 Relax PPTP password restrictions, just prevent starting with a !, and limit to common printable/keyboard characters so it doesn't result in invalid xml. Fixes #1720 2011-07-27 12:54:12 -04:00
jim-p
94efbf8b2a Shift OpenVPN require, it was causing CRLs to not save changes properly. 2011-07-27 12:05:48 -04:00
jim-p
e6af6518c1 Fix variable so CSC/Overrides for OpenVPN are actually deleted from the fs when deleted from the GUI. 2011-07-27 11:50:16 -04:00
jim-p
95305736ab Rework OpenVPN status, show status for shared key servers. 2011-07-27 11:37:18 -04:00
Bryan Haase
2c189c8cb1 Improved ipsec ldap xauth 2011-07-27 08:47:10 -05:00
Ermal
6390cdac26 Use the new change to be less distuptive 2011-07-25 19:42:22 +00:00
Ermal
073cd52e58 Resolves #1703. Correct array key value. 2011-07-25 19:05:47 +00:00
Chris Buechler
581e4f7afd Merge branch 'master' of github.com:bsdperimeter/pfsense 2011-07-25 05:23:31 -04:00
Bryan Haase
e9ccd9b1cb More sanity checking 2011-07-22 09:18:20 -05:00
Bryan Haase
64f3141f5f Ipsec xAuth patch 2011-07-22 08:18:55 -05:00
Scott Ullrich
b733ce0d13 Adding hook for first tr 2011-07-23 22:53:47 -04:00
Scott Ullrich
e5c6bd247d Load chosen but do not use it (for pkgs) 2011-07-23 21:56:19 -04:00
Scott Ullrich
20246b9377 Move hook up some 2011-07-23 21:51:27 -04:00
Ermal
cdfd39e2b9 Resolves #1703. Correctly delete a interface group members when the group is deleted. 2011-07-22 11:04:17 +00:00
Ermal
3ad667cd28 Correctly restart the SSL lighty instance when running. 2011-07-22 10:05:55 +00:00
Ermal
8818c188b5 Remove 'maxproc' since its unused in the code and correctly use maxprocperip to allow the GUI setting to be actually usable. Reported-by: http://forum.pfsense.org/index.php/topic,39155.0.html 2011-07-22 08:55:28 +00:00
Scott Ullrich
3a4ca65e81 Adding hooks that will be used for filtering plugins 2011-07-23 21:06:10 -04:00
Scott Ullrich
4a6cf823f3 Move hook code up a few lines 2011-07-23 20:03:26 -04:00
Scott Ullrich
7a7ec6f4a8 Add hook for overriding interfaces 2011-07-23 19:14:15 -04:00
Scott Ullrich
4bb99603d3 Add chosen js library (mit lic). Modify interface multiple select box to use. 2011-07-23 18:51:32 -04:00
Scott Ullrich
8c5bf3d799 Add hook for bottom icon row 2011-07-23 18:36:12 -04:00
Scott Ullrich
5fec5fe4c3 Add hook and fix style for anti lockout 2011-07-23 18:25:00 -04:00
Scott Ullrich
7c1e7572b7 Add missing ; 2011-07-23 18:04:57 -04:00
Scott Ullrich
afabae93ea Adding pre_id_tablerow hook 2011-07-23 18:02:47 -04:00
Chris Buechler
4b891efde0 Revert "fix text" 
This reverts commit 423023b6df.
 2011-07-23 17:20:50 -04:00
Chris Buechler
423023b6df fix text 2011-07-23 17:01:35 -04:00
Scott Ullrich
1a700ea631 Adding apply hooks 2011-07-22 20:09:50 -04:00
Chris Buechler
1ee5815c75 make the tab character limit 92, leaves plenty of room and prevents some custom builds from unnecessarily turning tabs into a drop down 2011-07-22 18:34:57 -04:00
Scott Ullrich
e099a6710a Bump to 1.7 2011-07-22 17:17:24 -04:00
Ermal
53a3755807 Clear \r from these files to be readble 2011-07-22 17:34:30 +00:00
Ermal
8fd84f8778 Ticket #749. Make the rules of the traffic shaper wizard select the wan side of the interfaces to not make the intra-lan traffic classifible in this way. 2011-07-22 17:27:51 +00:00
Ermal
739e227a98 Plug a security risk on CP where a user can login by submitting a special request 2011-07-21 21:10:22 +00:00
Ermal
adbb495cd6 Fix redirurl collection so after login the user can be redirected correctly 2011-07-21 21:09:56 +00:00
Evgeny Yurchenko
51cd7a1e31 Bug#1688. DHCP server subnet input validation needs to check config.xml, not ifconfig. 2011-07-19 21:01:54 -04:00
jim-p
d58b93d2e4 Fix label for SMTP server. Hostnames work fine. 2011-07-19 16:32:39 -04:00
Scott Ullrich
810a11bc76 Adding dashboard hook 2011-07-18 18:22:06 -04:00
Scott Ullrich
173d8e756f Adding hook to pre_table for aliases 2011-07-18 18:17:23 -04:00
Scott Ullrich
193716d076 Add alias edit hook 2011-07-18 18:12:54 -04:00
Scott Ullrich
2a74593eee Add pre_input_errors hook to interfaces assign 2011-07-18 18:07:51 -04:00
Vinicius Coque
343d49817a Merge remote-tracking branch 'mainline/master' into inc 2011-07-18 16:39:30 -03:00
Scott Ullrich
48fc39a3c0 Adding pre_input_errors hook 2011-07-18 15:25:29 -04:00
Scott Ullrich
b4b7bda609 Revert "Move early call up a bit" 
This reverts commit 35843e59c8.
 2011-07-18 15:23:41 -04:00
Scott Ullrich
35843e59c8 Move early call up a bit 2011-07-18 15:12:03 -04:00
Vinicius Coque
b1e4005f9f removes variables concatenation on gettext strings 2011-07-18 15:33:28 -03:00
Vinicius Coque
3f48162fde Merge remote-tracking branch 'mainline/master' into inc 2011-07-18 14:42:51 -03:00
Vinicius Coque
d1d0a1ad1b makes correct use of printf and gettext 
removes variables names and replace it with '%s'
 2011-07-18 14:33:20 -03:00
Scott Ullrich
40b8379682 Adding hook for interfaces edit 2011-07-18 12:26:40 -04:00
Scott Ullrich
920d1d0151 Adding hook for interfaces edit 2011-07-18 12:26:17 -04:00
Scott Ullrich
10995178ee Make name similar 2011-07-17 16:33:21 -04:00
Scott Ullrich
1db196b214 Adding hooks 2011-07-17 16:29:36 -04:00
Chris Buechler
cb2518bf5a Merge branch 'master' of git@github.com:bsdperimeter/pfsense 2011-07-16 22:15:23 -04:00
Scott Ullrich
0040bcfa59 Adding hook for interfaces allowing pfCenter and friends to add interfaces to the dropdown 2011-07-16 20:55:30 -04:00
Ermal
f171573896 Actually increase the default queue length for the new default queue 2011-07-15 19:22:19 +00:00
Ermal
058a4f1c03 Respect the p2p catchall setting. 2011-07-15 19:17:59 +00:00
Ermal
8f864d33ea Add checks to prevent php warnings. 2011-07-15 19:11:41 +00:00
Ermal
ed7c364d3a Re-enable downstream queues but with the difference that the default queue now tries to use all the link when possible and the bandwidth limit is specified on a subqueue instead of the interface. 2011-07-15 19:08:15 +00:00
Ermal
b2608f7276 Re-enable downstream queues but with the difference that the default queue now tries to use all the link when possible and the bandwidth limit is specified on a subqueue instead of the interface. 2011-07-15 19:02:22 +00:00
Ermal
6fd23d7a46 Revert "Ticket #749. Do not create the queues at LAN side for traffic_shaper_wizard_dedicated. Since we cannot control bandwidth its useless to try to handle it(ALTQ was built with this concept in mind)." 
This reverts commit cd3346e205.
 2011-07-15 18:20:48 +00:00
Ermal
1750ed78d6 Re-enable downstream queues but with the difference that the default queue now tries to use all the link when possible and the bandwidth limit is specified on a subqueue instead of the interface. 2011-07-15 18:19:58 +00:00
Ermal
746fc9ec0a Revert "Ticket #749. Do not create the queues at LAN side for traffic_shaper_wizard and traffic_shaper_wizard_multi_all. Since we cannot control bandwidth its useless to try to handle it(ALTQ was built with this concept in mind." 
This reverts commit 4447358371.
 2011-07-15 17:36:16 +00:00
Ermal
fe2031ab18 Ticket #1052. Enforce certificates if they are present for authenticating to ldap. Allow to select a CA under ldap type authentication backend to be used for this. 2011-07-15 13:10:40 +00:00
Ermal
e6bd231242 Fixes #1618. Always convert the NAS_PORT value to int in php and pass the attribute type during encoding to guarantee that it is encoded as an integer. 2011-07-15 08:03:16 +00:00
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
Chris Buechler
650969bfd6 Merge branch 'master' of git@github.com:bsdperimeter/pfsense 2011-07-08 06:07:56 -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
Ermal
b0d6223f89 When editing a vlan and chaning its tag id and the vlan is assigned correct even the interface name of the assignment otherwise we result in breaking the install. 2011-06-27 19:01:43 +00:00
jim-p
f257c13931 Don't do a csrf check when downloading packet capture, see http://forum.pfsense.org/index.php/topic,37794.0.html - also exit after sending the file to the user to avoid partial broken page loads after downloading a packet capture. 2011-06-27 14:42:25 -04:00
jim-p
8a385f4274 Merge remote branch 'upstream/master' 2011-06-27 14:06:33 -04:00
jim-p
39e268c4fd Add a button to reset the RRD data (rm's rrd files and reinitializes). 2011-06-27 13:11:41 -04:00
Warren Baker
e4b9d53bd3 Be consistent with upper and lowercase. 2011-06-27 16:57:43 +02:00
jim-p
84296ca3f7 Merge remote-tracking branch 'upstream/master' 2011-06-26 15:03:35 -04:00
Evgeny Yurchenko
0da02ef5d9 Bug #1615. Half-fix. 2011-06-26 00:36:40 -04:00
Chris Buechler
271e9b69bb fix whitespace 2011-06-25 05:37:05 -04:00
Evgeny Yurchenko
22b380aa6f Internal cert and CSR creation error handling added. 2011-06-23 20:28:31 -04:00
Evgeny Yurchenko
1b6d9fa59c Internal CA creation error handling added. 2011-06-23 20:05:35 -04:00
Evgeny Yurchenko
95c8cf48f9 Intermediate CAs and openssl_xxx() error checking in CA management. 2011-06-23 19:02:34 -04:00
jim-p
034e4e83d7 Merge remote branch 'upstream/master' 2011-06-23 16:12:05 -04:00
Scott Ullrich
ca4acbcdd8 After an interface mismatch and apply actually show when we are rebooting instead of the same message that the interface mismatch exists when really the system is rebooting. 2011-06-23 14:08:38 -04:00
jim-p
0e61e3e47e Merge remote branch 'upstream/master' 
Conflicts:
	etc/inc/filter.inc
	etc/inc/util.inc
 2011-06-22 17:00:47 -04:00
Warren Baker
91c3133910 Revert "Correct displaying any availble default value." 
This reverts commit 01c170c461.
 2011-06-22 19:19:41 +02:00
jim-p
160d549788 Merge remote branch 'upstream/master' 2011-06-21 08:27:20 -04:00
jim-p
a6c85b8b67 More icons missing from certain themes... 2011-06-21 08:26:12 -04:00
jim-p
c7bb0eeda4 Merge remote branch 'upstream/master' 
Conflicts:
	etc/version
 2011-06-21 08:12:12 -04:00
Evgeny Yurchenko
f27526cd29 Do not store CA and CERT in config unless needed. Will allow deleting unused certs. 2011-06-21 04:02:04 -04:00
jim-p
90ecc0b62f Disable state killing in VPN down scripts. 2011-06-20 16:06:26 -04:00
jim-p
c880d03296 Fix ovpn-linkup so it writes out the proper gateway IP in all cases. 
(For some reason -n wasn't working properly, plus $5 is the right parameter for the remote IP here)
 2011-06-20 14:57:35 -04:00
jim-p
06bfdd53f6 Add missing theme images. 2011-06-20 10:40:32 -04:00
Vinicius Coque
f0b17f3f72 Merge remote-tracking branch 'mainline/master' into inc 2011-06-20 08:50:19 -03:00
jim-p
ffdcbeb67b Also ignore lines starting with server-duid, and fix the # ignore so it is anchored on the start of the line. Add a note to fix a loop later that can fall into infinity. 2011-06-19 12:39:11 -04:00
jim-p
248501cd9d Merge remote-tracking branch 'upstream/master' 2011-06-19 10:58:06 -04:00
Evgeny Yurchenko
dd4bded7de Bug #1602. diag_arp.php hangs when DNS server unreachable. 2011-06-17 11:27:28 -04:00
Scott Ullrich
2dfaa85fa0 Cleanup and drop verbosity 2011-06-17 19:40:06 -04:00
Scott Ullrich
ad893298b2 Add new config option cpdupPathsPrefix 2011-06-17 18:32:28 -04:00
Scott Ullrich
dbd3b18cd2 Turn down verbosity 2011-06-17 18:25:18 -04:00
jim-p
c41602e15c Add a GUI field to adjust the max number of processes for lighttpd. 2011-06-17 13:53:42 -04:00
Evgeny Yurchenko
24cbe7a895 Bug #1437. Dropdown list for country codes for CSRs (Cert Manager) 2011-06-17 00:57:49 -04:00
Evgeny Yurchenko
21cc2faa85 Bug #1437. Check for invalid characters in the fields for ca, cert and csr. 2011-06-17 00:41:24 -04:00
Evgeny Yurchenko
9d2d65f3a3 Bug #1437. Dropdown list for country codes (CA manager) 2011-06-16 23:04:49 -04:00
jim-p
d56f17d1cc Merge remote branch 'upstream/master' 2011-06-15 12:15:31 -04:00
Ermal
12a0cd7461 Remove obsolete file lurking on installs. 2011-06-15 14:04:03 +00:00
Ermal
5aa7a46ce8 Ticket #1598. Correctly handle ipalias vips when re-enabling carp from the carp_status screen. 2011-06-15 13:43:43 +00:00
jim-p
e49d4564db Merge remote branch 'upstream/master' 
Conflicts:
	etc/inc/globals.inc
	etc/inc/upgrade_config.inc
 2011-06-14 16:41:15 -04:00
jim-p
144fbff2a1 Show the OpenVPN instance description when listing interfaces to assign in the gui. 2011-06-14 16:36:37 -04:00
Warren Baker
88adfa28a8 Allow Accounting Updates to become configurable when Accounting is selected. 2011-06-14 15:43:17 +02:00
Ermal
fddb3cd6b8 Allow people to enter another user than admin for syncrhonizing in the carp settings page. 2011-06-14 13:40:17 +00:00
Ermal
01c170c461 Correct displaying any availble default value. 2011-06-14 13:39:03 +00:00
Ermal
1127df5f18 Correct check for ipaliases over carp so we do not allow the deletion. 2011-06-14 13:16:00 +00:00
Ermal
2708a5cf16 NEw functiong does_vip_exist() which works for carp and ipalias type vips to help in carp sync issues. Fixes #1598 2011-06-14 11:36:20 +00:00
Ermal
63f81fbd88 Do not assume that every merge is about vips. Found-by: Jim 2011-06-13 18:16:03 +00:00
Ermal
19ed162443 unset after checking that no reconfiguring is needed. 2011-06-13 15:04:59 +00:00
Warren Baker
f8c462dd89 Allow packages to specify that their tabmenus should not be a drop-down list by using a <no_drop_down/> tag. 2011-06-12 16:10:22 +02:00
jim-p
424be584c3 Allow someone to add a host DNS override twice, so long as the IP type isn't the same. Lets you add a host override for both IPv4 and IPv6 for the same hostname. 2011-06-11 20:51:05 -04:00
jim-p
06da79f9a5 Merge remote-tracking branch 'upstream/master' 2011-06-11 20:49:50 -04:00
Ermal
5ebe85e934 Fixes #1327. Trigger synching of vouchers to config through check_reload_status. Retire the saveinterval option since it is not useful anymore. Use the prune process of captiveportal to sync vouchers as well to fix issues as reported-by: http://forum.pfsense.org/index.php/topic,37636.0.html 2011-06-10 20:02:47 +00:00
Ermal
b9eccc7781 Fixes #1327. Put description that a full qualified hostname is required. 2011-06-10 19:20:47 +00:00
jim-p
de408516a8 Merge remote branch 'upstream/master' 2011-06-10 12:37:58 -04:00
jim-p
7401c8c451 Allow OpenNTPD to listen on Virtual IPs, not just interfaces. Fixes #342 2011-06-08 17:33:26 -04:00
Ermal
92ca32ccbe Actually make this code more readble. 2011-06-08 18:22:04 +00:00
Ermal
d1e0382258 Remove the entry from old entries even when there are no changes to prevent marking them down. 2011-06-08 18:21:00 +00:00
jim-p
156bf9b119 Merge remote branch 'upstream/master' 2011-06-08 14:13:22 -04:00
Ermal
7fc6c00573 Generate proper index for unsetting so we do not destroy all the vips in the backup. 2011-06-08 07:29:33 +00:00
Scott Ullrich
720e2e6036 Nuke trailing newline 2011-06-07 11:09:31 -04:00
Vinicius Coque
d8012adbce Merge remote-tracking branch 'mainline/master' into inc 
Conflicts:
	etc/inc/voucher.inc
	usr/local/www/fbegin.inc
 2011-06-07 10:47:29 -03:00
Ermal
3f8a13e051 Oops correct the POST destination page. 2011-06-07 08:08:13 +00:00
Scott Ullrich
60ccf01c45 Add a div around input errors box so that it can be hidden on subequent page posting 2011-06-06 20:44:50 -04:00
Ermal
0b704a404b Correct whitespace. 2011-06-06 15:48:38 +00:00
Ermal
43f26ab1ea Ticket #1412. Provide even a link to this page through System->User Manager 2011-06-06 11:04:41 +00:00
Ermal
e33be77c0e Ticket #1412. Fixing the access login to the user manager presented another problem since now users cannot change their passwords anymore. Allow this through another page and an extra priviledge needed to be added to the user for allowing them to change the password. 2011-06-06 10:53:42 +00:00
Evgeny Yurchenko
6627e4ec35 Restoring gray background to the right of some tables in GUI (theme pfsense_ng). 2011-06-05 16:23:10 -04:00
Evgeny Yurchenko
79633b6c18 Reverting class="sortable" damaged by commit 17d5077f61 2011-06-05 16:09:59 -04:00
Evgeny Yurchenko
8527bc02a6 Merge remote branch 'origin/master' 2011-06-05 15:17:09 -04:00
Evgeny Yurchenko
17d5077f61 Restoring gray background to the right of some tables in GUI. 2011-06-05 15:15:15 -04:00
Chris Buechler
cf3711855b s/WAN// 2011-06-04 23:18:34 -04:00
Chris Buechler
14c354eec1 fix typo, add warning 2011-06-04 22:58:13 -04:00
Chris Buechler
81debd44c8 Show the MAC on the page rather than just a hover, too many times it needs to be copied/pasted or quickly viewed, and the vendor isn't nearly as useful as the actual MAC. 2011-06-04 20:43:31 -04:00
jim-p
534375b6f0 Merge remote branch 'upstream/master' 
Conflicts:
	etc/inc/openvpn.inc
 2011-06-03 15:34:54 -04:00
jim-p
c8ff68a457 Allow duplicating an IPsec phase 2. The code was already on vpn_ipsec_phase2.php but unlinked. 2011-06-03 10:29:44 -04:00
jim-p
5cd9e96a42 Add a GUI selection for racoon's generate_policy directive since it may be useful in certain configurations, especially for mobile clients. 2011-06-03 09:50:53 -04:00
jim-p
039cb9203f Add a button here to clear the package lock. 2011-06-03 09:29:46 -04:00
jim-p
19cdeb3eda Instead of showing an emtpy drop-down for CA/Cert/CRL, show an error that there are none defined, and link to the page to create one. 2011-06-03 09:03:13 -04:00
jim-p
1591ea6fc8 Remove the warning message that a user doesn't have any CA/Certs when viewing OpenVPN connections. This is just confusing people, and isn't relevant to people using only shared key tunnels. 2011-06-03 09:03:12 -04:00
jim-p
2f51259b41 Redirect back to the CA/Cert management page after delete so a person can't refresh and accidentally delete other CA/Certs. (CRLs are deleted differently and don't need this fix) 2011-06-03 09:03:11 -04:00
jim-p
f451ea09a2 Show how much data has passed on an SAD entry. 2011-06-02 12:47:53 -04:00
jim-p
e96bbf82c7 Patch from EvgenyY to allow editing an existing p2 without it being flagged a duplicate. 2011-06-02 11:43:05 -04:00
jim-p
0640a65b13 Add "Default" choice that will unset the media/mediaopt, otherwise whatever is first in the list is saved in the config. 2011-06-02 09:07:26 -04:00
Ermal
3781d8099c Correct input object name from wrong copy/pasto. Reported-by: http://forum.pfsense.org/index.php/topic,37369.0.html 2011-06-02 08:14:10 +00:00
Evgeny Yurchenko
fc3dcc8b00 Merge remote branch 'origin/master' 2011-06-01 18:29:55 -04:00
Evgeny Yurchenko
3da5c50d5c Bug #1560.IPsec GUI needs to reject duplicate subnets in phase 2s for a given phase 1 (improvement of previous patch) 2011-06-01 18:28:15 -04:00
jim-p
ee0cf21f7c Merge remote branch 'upstream/master' 2011-06-01 16:56:04 -04:00
jim-p
a01ce4c764 Make the ICMP echo request type less ambiguous, and since it's likely the main one to get used, move it to the top. 2011-06-01 16:54:42 -04:00
Ermal
7af360ceef Add tunable, by default disabled, to enable the default gateway switching feature when the default one 'disappears'. 2011-06-01 23:25:21 +08:00
Ermal
f8f3732a63 Fixes #1412. Properly pass the page to match so users are not always presented with the change password screen. Proper fix. 2011-06-01 23:25:21 +08:00
Ermal
f4645d7f48 Add tunable, by default disabled, to enable the default gateway switching feature when the default one 'disappears'. 2011-06-01 14:03:57 +00:00
jim-p
58005e5213 Merge remote branch 'upstream/master' 
Conflicts:
	conf.default/config.xml
	etc/inc/filter.inc
	etc/inc/globals.inc
	etc/inc/pfsense-utils.inc
	etc/inc/upgrade_config.inc
	usr/local/www/interfaces.php
 2011-06-01 09:00:09 -04:00
Ermal
9584d162d2 Fixes #1412. Properly pass the page to match so users are not always presented with the change password screen. Proper fix. 2011-06-01 12:23:52 +00:00
Ermal
97c1f2684c Fixes #1412. Properly pass the page to match so users are not always presented with the change password screen. 2011-06-01 11:14:51 +00:00
Ermal
695a35aecd Ticket #944. Also destory the previous interface if the user changing the vlan tag of an existing vlan entry. 2011-06-01 10:49:21 +00:00
Ermal
6b421a0fb4 Fixes #944. Use the correct interface name to destroy the previous vlan if the parent is changed. 2011-06-01 10:49:21 +00:00
Evgeny Yurchenko
538b6eb353 Bug #1560. IPsec GUI needs to reject duplicate subnets in phase 2s for a given phase 1(site-to-site). 2011-05-31 23:41:32 -04:00
Evgeny Yurchenko
9d545c88c6 Merge remote branch 'origin/master' 2011-05-31 05:05:58 -04:00
Scott Ullrich
f9d7c5b3c4 Use array_overlay() 2011-05-31 14:42:22 -04:00
Scott Ullrich
0b581a8acf Use array_extend 2011-05-31 14:28:13 -04:00
Scott Ullrich
485b1ca5ce Remove debugging code 2011-05-31 13:47:53 -04:00
Scott Ullrich
db748384c1 Add merge handler code 2011-05-31 13:45:16 -04:00
Scott Ullrich
10d74dff5a Remove bogus protection. We have better handling of this now. 2011-05-31 12:35:17 -04:00
Evgeny Yurchenko
061f28bfd5 Bug #1560. IPsec GUI needs to reject duplicate subnets in phase 2s for a given phase 1(mobile clients). 2011-05-31 05:03:39 -04:00
Evgeny Yurchenko
edb2a3dab4 Bug#1528. Automatically create outbound NAT rules on WAN for localhost when switching to manual. 2011-05-30 22:10:36 -04:00
Scott Ullrich
a3d58a12bf Use aon plugin 2011-05-30 15:27:50 -04:00
Scott Ullrich
2ba7d6f8ef Add plugin features to aon edit 2011-05-30 15:25:25 -04:00
Scott Ullrich
2ea00c3e74 Add missing plugin code. Move the pre_write section up a bit. 2011-05-30 12:28:21 -04:00
Evgeny Yurchenko
b45babaeb5 Bug #1403. Filter Rules description do not get saved when "(quote) present as character 2011-05-27 21:55:22 +00:00
Ermal Luçi
ce91583bde Merge pull request #1 from EvgenyY/6e2a15e677fa0558ba0c9b1700be38f4065a76f6 
Speed/duplex select for interfaces
 2011-05-28 09:19:33 -07:00
Scott Ullrich
552605326c Add note about voucher sync (only enable on slave nodes). 2011-05-27 13:27:34 -04:00
Scott Ullrich
58f963d0da Clarify auth option to include Vouchers 2011-05-27 13:06:29 -04:00
Evgeny Yurchenko
6e2a15e677 Hiding mediaopt under Advanced button 2011-05-27 15:21:25 +00:00
Bill Marquette
e5770bc233 DHCP only knows about IPv4 
don't allow admins to shoot themselves with v6 addresses in the config
 2011-05-26 22:52:26 -05:00
Bill Marquette
13f0762d9c Fix #1277 
Wasn't able to remove the multicast RIPv2 discovery at startup, but
all ripv1 response's are gone now.
 2011-05-26 22:28:19 -05:00
Ermal
b75d32e558 Free ipfw rule number after mac pass-through deletion. 2011-05-26 20:51:23 +00:00
Ermal
ab731f5408 Bring more consistent style to CP edit mac and ip passthrough pages. 2011-05-26 20:16:08 +00:00
Warren Baker
1a6cb6e763 Remove decimals from cumulative users graph. 2011-05-26 13:41:12 +02:00
Seth Mos
668ce1f9e7 Increase the minimum time between generating images from 5 to 15 seconds to prevent DoS the firewall. 2011-05-26 10:14:02 +02:00
Seth Mos
d67d99a185 Fix packet graph label alignment 2011-05-26 10:13:00 +02:00
Seth Mos
a63f2b7d6a Fix the graph label alignment 2011-05-26 10:10:10 +02:00
Scott Ullrich
d65962a773 Adding a new hook system for firewall nat edit and firewall rules edit page. 
Basically if the directory exists it will suck in the files to extend these pags.

/usr/local/pkg/firewall_nat/input_validation
/usr/local/pkg/firewall_nat/pre_write_config
/usr/local/pkg/firewall_nat/htmlphpearly
/usr/local/pkg/firewall_nat/htmlphplate

/usr/local/pkg/firewall_rules/input_validation
/usr/local/pkg/firewall_rules/pre_write_config
/usr/local/pkg/firewall_rules/htmlphpearly
/usr/local/pkg/firewall_rules/htmlphplate
 2011-05-25 19:43:51 -04:00
Scott Ullrich
474f36d1b2 * Add is_ipaddr_configured() so that people do not need to reinvent the wheel for this task 
* Check to make sure the administrator is not entering the IP address of the same host preventing a issue where the firewall will sync the voucher database to itself and cause the webConfigurator to crash.
 2011-05-25 18:02:05 -04:00
Ermal
c206a2ab96 Disable csrf checks when posting from scripts. 2011-05-25 20:36:01 +00:00
Ermal
05771a2485 Provide a voucher_expire function so that voucher can be expired through a POST. 2011-05-25 20:28:10 +00:00
Vinicius Coque
669113f9d1 Merge remote-tracking branch 'mainline/master' into inc 2011-05-25 14:35:40 -03:00
Vinicius Coque
19bd7032b2 Remove gettext from negotiation mode 
It is causing errors on raccon because config file were generated with
translated words
 2011-05-25 14:33:10 -03:00
Ermal
f6f1c84748 Update some code to be more readble and more compliant to php5 2011-05-25 11:02:53 +00:00
jim-p
4e12754d1a Fix automatic and manual outbound NAT for PPTP. Fixes #954 2011-05-24 13:39:38 -04:00
Vinicius Coque
45d4b71e07 Merge remote-tracking branch 'mainline/master' into inc 2011-05-23 15:57:23 -03:00
Vinicius Coque
d21d6e2090 Merge remote-tracking branch 'mainline/master' into inc 
Conflicts:
	etc/inc/interfaces.inc
	etc/inc/upgrade_config.inc
	etc/inc/vpn.inc
 2011-05-23 15:41:26 -03:00
lgcosta
7a18dfa4ed Fixes #1444. Implements the same fix that issue ermal made in #1522 to the console menu 2011-05-23 11:56:32 -03:00
Evgeny Yurchenko
509ca889c9 Adding gui to choose media options for interfaces. 2011-05-21 15:35:35 +00:00
jim-p
f69d8346d5 Merge remote branch 'upstream/master' 2011-05-20 12:05:18 -04:00
jim-p
aa6699fbea Fix config sync issue. Resolves #1547 Fixed-by: Ermal 2011-05-20 10:27:29 -04:00
jim-p
e4aa1eaed4 Merge remote branch 'upstream/master' 2011-05-19 14:51:08 -04:00
jim-p
43a68abc9d Fix clearing of PPTP/PPPoE/L2TP server raw logs. Fixes #1340 2011-05-19 14:47:56 -04:00
jim-p
51f8a7f8d5 Correct password variable name for input validation test on PPTP users. Fixes #1239 2011-05-19 14:26:26 -04:00
jim-p
bac9941b5e Reject alias names that are too long. Fixes #1510 2011-05-19 13:34:43 -04:00
jim-p
c1f4af16f3 Show the DUID instead of the MAC. Fix online test. 2011-05-19 11:08:25 -04:00
jim-p
bcb24b81f5 Misc DHCPv6 lease view improvements (at least shows the IP...) 2011-05-19 10:44:54 -04:00
jim-p
27d0722d13 Merge remote branch 'upstream/master' 2011-05-19 08:50:48 -04:00
Ermal
2f6532d552 Fixes #1514. Differentiate in the carp settings between layer7, limiter and queues so layer7 and limiters do not rely on queues being active. 2011-05-18 23:09:48 +00:00
Ermal
c415a55bd3 Micro optimization. 2011-05-18 21:56:13 +00:00
Ermal
bb4fcffd7d Fixes #1522. Call interface reconfigure so we bring down the interface and than re-configure it. 2011-05-18 21:54:12 +00:00
Ermal
f51d4f989e Ticket #1534, #1433. Remove custom sync code for vip, since it array_merge() replaces same keys data when merging. But make the code for reloading only changed vips after merge better and some more checks. 2011-05-18 21:31:35 +00:00
Ermal
516114406b Ticket #1534, #1433. Properly merge carp interfaces and do not reload carp interfaces that have not change any configuration parameter. Also make merge_config_section_xmlrpc() an alias for restore_config_section_xmlrpc() since that what it is. 2011-05-18 21:11:10 +00:00
Chris Buechler
0d5c21f743 fix missing images for CRLs 2011-05-17 21:59:03 -04:00
Ermal
67d78c87c9 Ticket #1534. Serialize all the xmlrpc requests coming to the firewall. Seems such request can stomp into each other and create either corruption of xmlrpc request or other issues. 2011-05-17 21:18:33 +00:00
jim-p
f5adee3f6e Make sure all CP form elements are disabled/enabled with the master checkbox. 2011-05-17 14:24:39 -04:00
jim-p
1a13765065 Fixup MAC display on this other path too 2011-05-16 16:47:47 -04:00
jim-p
701989fbe4 Print the MAC mfg on another line in a smaller font if it's found. Less obtrusive than completely replacing the MAC. 2011-05-16 15:40:44 -04:00
Warren Baker
73bf4a46d9 Use base 1000 on user graphs and display cumulative of Total users logged in over the 'x' period. 2011-05-16 16:26:43 +02:00
Warren Baker
9cd7285680 Ensure that $timestamp is only ever written out if it contains a value and let file be retained through reboots. 2011-05-16 16:25:32 +02:00
Bill Marquette
325e316391 Merge branch 'master' into smos-ipv6 
Conflicts:
	etc/inc/pfsense-utils.inc
 2011-05-14 17:44:40 -05:00
Evgeny
57f2840e1f MAC prefix to vendor resolution at Status->Interfaces, Status->DHCP leases, Diagnostics->ARP table 2011-05-14 11:23:05 -05:00
Bill Marquette
92ca10c1f6 Merge branch 'axscode-pfs' 2011-05-14 11:16:56 -05:00
Bill Marquette
23b774e0cf Merge branch 'master' into yakatz-ssl 2011-05-14 11:08:39 -05:00
Bill Marquette
2ad2758fef Merge branch 'drcookie-he.net' 2011-05-14 10:48:57 -05:00
Bill Marquette
fed025ea77 Teach row_helper about ipv6, should fix issue found here: 
http://forum.pfsense.org/index.php/topic,36709.0.html
 2011-05-14 10:08:19 -05:00
Chris Wells
8ea77433a9 Added HE.net (dns.he.net) to the list of available dyndns services. 2011-05-14 10:39:13 -04:00
jim-p
e7237dd03c Fix interface recognition for diag > arp. It was't seeing wireless interfaces properly. 2011-05-13 13:27:35 -04:00
jim-p
b45630bf1a Fix whitespace. 2011-05-13 13:09:47 -04:00
jim-p
f1273b82b6 Sync with dhcp leases reading code. 2011-05-13 13:07:56 -04:00
Seth Mos
69be9601ac Merge remote branch 'upstream/master' 
Conflicts:
	etc/inc/vslb.inc
	etc/version
 2011-05-13 13:43:37 +02:00
jim-p
042578fd63 Fix comment 2011-05-12 14:04:04 -04:00
jim-p
dc073abdfd Also skip the rewind binding state or leases show expired. Reported at http://forum.pfsense.org/index.php/topic,36657.0.html 2011-05-12 13:59:58 -04:00
Scott Ullrich
eb06ca8eb8 Revert this change. reload_all() already sends a reload message. Unfortunately there is still something else lurking that causes a delay when loading the wizard step 2011-05-12 13:03:40 -04:00
Scott Ullrich
9545fe7a4e Use send_event() 2011-05-12 11:41:50 -04:00
Scott Ullrich
602e98063d Use send_message and issue the reload all operation in the background 2011-05-12 11:38:52 -04:00
jim-p
1031c9ea76 Make autocomplete on the login form optional. 2011-05-12 10:45:30 -04:00
Scott Ullrich
b148ab813f Skip step #9 for non pfSense branded installations 2011-05-11 16:40:45 -04:00
jim-p
728003c893 Various CRL fixes, handle empty internal CRLs better. 2011-05-11 16:10:49 -04:00
Scott Ullrich
51b9e41d9e Reload the wizard and then redirect to a wizard completed step. Prompt the user to donate to the project. 2011-05-11 15:26:11 -04:00
Seth Mos
cd9fa56b57 Fix the input validation, typo in the field name. Mark the prefix delegation range as not required. 2011-05-11 15:18:53 +02:00
Seth Mos
bfb3e7174a Add a prefix pool for prefix delegation. Doesn't work yet. ISC dhcpd complaining about the network mask being too short. 2011-05-09 23:23:16 +02:00
Chris Buechler
a9392a4e36 Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mterron-clone into review/master 2011-05-07 22:20:11 -04:00
jim-p
c7ac47fd2d Misc fixes to make the openvpn wizard stop re-creating a CA previously made via the wizard if you re-ran the wizard and chose a CA instead. Fixes #1512 2011-05-07 16:07:58 -04:00
Chris Buechler
2635f1f52f this should be checking for synchronizetoip not pfsyncpeerip 2011-05-07 00:14:54 -04:00
Ermal
5b06d9ccee Reorder instructions and do not reload dns if its not allowed from the dns allow override setting. 2011-05-06 21:27:14 +00:00
jim-p
114a929286 If we are disabling the radius inputs, also disable the secondary radius inputs. 2011-05-06 16:55:10 -04:00
jim-p
c07b267505 This field should be server2 2011-05-06 16:55:10 -04:00
Ermal
ac655e1b35 Use the availble constant on php for this and also the right value that comes with it since PHP never supported u_int. There is a bug open still on PHP about bcmod but some more info is needed. 2011-05-06 20:36:05 +00:00
Seth Mos
ed3956405e Add DHCP-PD support if the WAN interface is set to DHCP. 
Select a DHCP-PD prefix length in correspondence with your ISP. If set to "none" it will not be requested and normal DHCPv6 is performed.
You can set a link local IPv6 address on the LAN interface and select a DHCP-PD Prefix number from the drop down.
When the dhcp-pd request is succesful, a global IPv6 address from the prefix pool with the corresponding prefix number will be configured on that interface. We then start a rtadvd daemon for this interface.
 2011-05-06 12:09:57 +00:00
jim-p
f02c3e1de3 Misc OpenVPN CRL selection fixes. 2011-05-05 16:47:49 -04:00
Seth Mos
93a138ab04 Add a field for the prefix pools. Fix the DUID check 2011-05-05 22:41:39 +02:00
jim-p
461aa9d0ab When deleting a CA, delete its associated CRLs. 2011-05-05 16:14:10 -04:00
Charlie
0d8562ed34 Fix the parse error, missing bracket. 2011-05-05 19:46:18 +00:00
Seth Mos
7149c4e737 Add backend support for the dhcp v6 client 2011-05-05 19:29:50 +00:00
Ermal
8b1e7d04da Correct wrong key for checking if a interface type switched. Ticket #1420 2011-05-04 21:54:10 +00:00
Seth Mos
a9543eae56 Remove the dhcp6 type, add the DUID field to the dhcp config. 2011-05-04 14:26:56 +02:00
Seth Mos
2fb056d81a More DHCPv6 server fixes, split the function out into seperate v4 and v6. Make the router advertisement stand alone on the dhcp server page. 2011-05-04 10:58:40 +02:00
Seth Mos
dcb846e3cd Merge remote branch 'upstream/master' 
Conflicts:
	usr/local/www/status_rrd_graph_img.php
 2011-05-03 10:09:06 +02:00
jim-p
b01adece6e Set default colors explicity, the theme can then override them. This prevents missing colors in themes from crashing the graphs. 2011-05-02 15:32:04 -04:00
jim-p
49825b1711 If the rrd multiplier is negative, use 5% for out instead of 95% for the 95th percentile line. 2011-05-02 14:36:04 -04:00
jim-p
c639315e3c Set password on the OS instead of just the gui. Fixes #1485 2011-04-29 15:43:02 -04:00
Ermal
f7ea050596 Remove static routes that are added for dns servers when allow override is allowed when a ppp interface goes down. Code borrowed from dhclient-script. 2011-04-29 18:23:11 +00:00
Ermal
a73a9886e7 Ticket #1408. Honor the allow override settings even for ppp devices. 2011-04-29 18:19:57 +00:00
Ermal
9cf46050fc Correct saving of qinq specified members and also correctly destroy parent vlan when deleteing the interfaces. Also take care of attaching to netgraph now that we detach by default. 2011-04-28 21:21:11 +00:00
Ermal
40b0c024db Correct code description during assignment 2011-04-28 19:16:18 +00:00
Seth Mos
fcdc894353 Merge remote branch 'upstream/master' 
Conflicts:
	etc/inc/pfsense-utils.inc
 2011-04-28 11:33:48 +02:00
Chris Buechler
1dfb77950b fix typo 2011-04-27 21:10:02 -04:00
jim-p
b0c2087e17 Comment out debug print 2011-04-27 20:25:32 -04:00
jim-p
f35abee2f7 Whitespace cleanup, code cleanup, add choice to filter on ipv4/ipv6 and also accept a subnet to filter on via the host field. 2011-04-27 12:03:09 -04:00
jim-p
c41997ce79 Allow users to select SSL/TLS+User Auth with external authentication sources. 2011-04-26 17:08:05 -04:00
jim-p
7100a85c32 No need to include head.inc twice 2011-04-26 14:37:43 -04:00
jim-p
9f5d14ce72 Show OpenVPN instances on Status > Traffic Graphs, with descriptions. 2011-04-25 15:50:53 -04:00
Seth Mos
b1ba04cf4a Add ipv6 tunnel remote subnets 2011-04-25 19:17:30 +02:00
jim-p
d8da6350bc Provide a method for rebrands to force a theme. Otherwise upgrading nanobsd from pfSense to a rebrand image without the theme in the config.xml will have a broken GUI since the theme isn't there. 2011-04-22 11:23:43 -04:00
yakatz
2594f4010b missed a bit of my last commit 2011-04-21 16:05:51 -04:00
jim-p
908cbaf91a Set user when removing privileges, otherwise things like the user's shell would not be reset until pressing save, which is inconsistent with that step not being needed when adding privileges. 2011-04-21 15:33:13 -04:00
yakatz
a29aeb47af Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline.git 2011-04-21 14:34:19 -04:00
yakatz
a828210b74 checking moduli of ssl csr request and response 2011-04-21 14:29:54 -04:00
jim-p
46698c3f3c Reject encrypted CA private keys. Resolves #1446 2011-04-21 10:33:38 -04:00
yakatz
e2e934e0c9 override option for certificate subject mismatch 2011-04-18 15:18:01 -04:00
Ermal
42c0700392 Add an option under advanced->misc to specify a proxy for retreiving pfsense package info or downloading packages. 2011-04-18 18:25:56 +00:00
jim-p
e8503ff4b6 Only start log update ajax timer if the updateDelay is defined. http://forum.pfsense.org/index.php/topic,35771.0.html 2011-04-18 13:08:06 -04:00
Seth Mos
81b44848d3 Surround the IPv6 address with brackets 2011-04-18 11:08:32 +02:00
Seth Mos
13399e172b Properly add dns and wins fields, load them on page load. 2011-04-15 22:57:38 +02:00
Vinicius Coque
a51493d198 Merge remote-tracking branch 'mainline/master' into inc 
Conflicts:
	etc/inc/gwlb.inc
 2011-04-15 13:38:13 -03:00
jim-p
7b2fdeb3c5 Properly set/unset voucher enable/disable bit. 2011-04-15 12:11:52 -04:00
jim-p
b9bbae047a Move the link to add a gateway up next to the drop-down box so it is more obvious. 2011-04-15 08:53:23 -04:00
Seth Mos
6d3fd9387d Change the wording and the link placement for adding a new gateway 2011-04-15 14:37:18 +02:00
Seth Mos
b1c305e747 Merge remote branch 'upstream/master' 2011-04-15 10:42:20 +02:00
Seth Mos
cfd404540e Make it possible to add a IPv6 gateway using the ajax add button 2011-04-15 10:41:06 +02:00
jim-p
d2903c0cab Test if a variable is set before trying to unset it. If a user has no rules in their config, then $config['filter'] would not be undefined, so unsettings $config['filter']['bypassstaticroutes'] would result in an error. http://forum.pfsense.org/index.php/topic,35702.0.html 2011-04-14 13:26:04 -04:00
smos
c8cc0c1c5a Add missing fields for l2tp to define dns and wins servers 2011-04-13 09:52:58 +02:00
jim-p
d67b6b175c Also exclude grep from running processes when grepping for a running packet capture. Also, fix other test to match the recent changes made. 2011-04-12 10:04:54 -04:00
Seth Mos
af8f910eeb Merge remote branch 'upstream/master' 2011-04-12 10:40:44 +02:00
Seth Mos
86966fba75 Merge remote branch 'upstream/master' 
Conflicts:
	etc/inc/filter.inc
	usr/local/www/themes/the_wall/rrdcolors.inc.php
 2011-04-12 10:39:20 +02:00
jim-p
127eb8e023 Add a toggle under System > Advanced on the misc tab to enable/disable debug mode for racoon. 2011-04-11 16:58:13 -04:00
jim-p
e9e06fb205 Fix copy/paste error 2011-04-08 16:08:11 -04:00
jim-p
ac6651c945 Make sure a theme directory actually exists before blindly using it. 2011-04-08 14:15:50 -04:00
jim-p
edf99ce40c Rework ntpdate_sync_once.sh, so it makes sure ntp/ntpdate/itself are not running before trying to sync time, and then launch ntpd at the end for time sync (last commit was premature) 2011-04-08 11:46:30 -04:00
jim-p
54c185948c Don't unconditionally start ntpd after doing ntpdate, it might be disabled. 2011-04-08 11:20:41 -04:00
jim-p
2db351a746 Send ntpdate output to syslog 2011-04-08 11:20:25 -04:00
Scott Ullrich
e05458b052 Remove extra variable set 2011-04-07 12:35:00 -04:00
Scott Ullrich
7ec2a858af Remove copy paste 2011-04-07 12:34:23 -04:00
Scott Ullrich
0c951d9bee Unbreak check if capture is running 2011-04-07 12:33:41 -04:00
Scott Ullrich
5d7881615d When using ' variables are not expanded. Use double quotes so that the variable is exanded 2011-04-07 12:00:32 -04:00
jim-p
c76fc19f32 Don't test for a user cert here either, see previous commit. 2011-04-07 11:49:40 -04:00
jim-p
72d8453d3b Don't test if a cert is in use here, you could in theory use a cert for a user and a server. 2011-04-07 11:47:24 -04:00
jim-p
8fee59d6fe Fix link; use same message for missing certs. 2011-04-06 19:53:46 -04:00
Scott Ullrich
0930bd0184 Make the default openvpn cert authority message a bit relaxed and let user know about the wizard option as well 2011-04-06 19:41:52 -04:00
Ermal
87bb66af3e Correct text to include PPTP as well. 2011-04-06 18:23:24 +00:00
Ermal
9a36dc9d24 Resolves #1391. Bring back VPN auto rule disable advanced setting. 2011-04-06 18:22:27 +00:00
Ermal
d10da0f995 Resolves #1418. Correct test to actully do what's intended. 2011-04-06 10:49:51 +00:00
jim-p
0ef48aed8b Make sure all themes have the right colors defined. 2011-04-04 13:41:21 -04:00
Ermal
1309faddc8 <script/> tags are put in the function build_javascript no need to put them here. Prevents errors reported at:http://forum.pfsense.org/index.php/topic,34139.0.html 2011-04-04 15:05:59 +00:00
Vinicius Coque
f599d893ff Merge remote-tracking branch 'mainline/master' into inc 
Conflicts:
	etc/inc/shaper.inc
 2011-04-04 10:42:48 -03:00
jim-p
4936ff53df Switch back to dev_mode so existing configs aren't broken by the other changes. 2011-04-01 14:11:33 -04:00
lgcosta
681b43b079 standardize the device_mode variable 2011-04-01 12:06:55 -03:00
jim-p
b482254882 Try again to fix the calculation for out bits 95th percentile. (Works for me) 2011-03-31 13:08:06 -04:00
Vinicius Coque
7de4284cff Add gettext calls on main menu 2011-03-31 13:50:30 -03:00
Vinicius Coque
8bade64c4b Revert "Add gettext calls on main menu" 
This reverts commit 67f0f0a772.

system_firmware.php shouldn't be commited
 2011-03-31 13:48:47 -03:00
Vinicius Coque
67f0f0a772 Add gettext calls on main menu 2011-03-31 13:47:48 -03:00
Vinicius Coque
9158988035 Merge remote-tracking branch 'mainline/master' into inc 2011-03-31 13:34:36 -03:00
Chris Buechler
78544d4a99 clarify text 2011-03-31 06:06:01 -04:00
jim-p
84575284b5 Apparently rrdtool VDEF functions can't take a multiplier, only CDEF. Fixes traffic graphs. 2011-03-30 20:48:24 -04:00
jim-p
bfa992bc4e Allow editing of CAs, so that imported CAs can have their private keys added later (mainly affected users upgrading from 1.2.3 and wanting to use the cert manager). Also, allow editing the CA's serial, since this shouldn't really be 0 for imported CAs, but the serial of the last cert that was made from this CA. 2011-03-30 16:37:45 -04:00