summaryrefslogtreecommitdiffstats
path: root/etc/inc/vpn.inc
Commit message (Collapse)AuthorAgeFilesLines
* Fixes #2364. On busy pppoe servers it might take some time before mpd exits. ↵Ermal2012-05-231-0/+4
| | | | Check for this before trying to restart
* Make sure that we match multiple characters.smos2012-05-221-1/+1
| | | | Ticket #2415
* First round of CARP vip renaming changessmos2012-05-221-1/+1
| | | | Ticket #2415
* routes should not be skipped when IPsec is on WAN, as WAN may not be the ↵Chris Buechler2012-04-231-3/+2
| | | | default gateway.
* this is only valid in mpd5 (really?...) Revert "RADIUS accounting updates ↵Chris Buechler2012-04-111-2/+0
| | | | | | are needed for PPPoE and L2TP too" This reverts commit 02b14dcb49da8dc278e87785bb3f811336bf1fd0.
* RADIUS accounting updates are needed for PPPoE and L2TP tooChris Buechler2012-04-111-0/+2
|
* Don't let an empty subnet into racoon.conf, it can cause parse errors. ↵jim-p2012-02-141-0/+9
| | | | Ticket #2201
* Fix reference to PPTP secondary RADIUS server shared secret.jim-p2012-02-131-1/+1
| | | | See http://forum.pfsense.org/index.php/topic,46103.0/topicseen.html
* Only do foreach on the p2's if it's actually an array.jim-p2012-01-311-40/+39
|
* Ensure we always write out a blank spd.conf if there are no phase 2 entries. ↵jim-p2011-12-091-11/+10
| | | | If you delete the last phase 2 and then apply, it will still be in spd.conf and used by racoon even with no phase 2's configured.
* Fix several issues in pppoe code and remove duplicated code.Ermal2011-08-301-2/+2
|
* Make initial changes to allow pfSense to work in a jail.Andrew Thompson2011-08-171-0/+7
| | | | | | 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.
* Also escape \ in pptp passwords.jim-p2011-07-281-1/+2
|
* Correct whitespace and some problems in the just merged ldap auth sorce for ↵Ermal2011-07-271-23/+24
| | | | racoon
* Merge pull request #8 from ninja76/masterErmal Luçi2011-07-271-1/+25
|\ | | | | IPSec xAuth allowing LDAP to be used as a backend
| * Improved ipsec ldap xauthBryan Haase2011-07-271-2/+3
| |
| * format errorBryan Haase2011-07-221-2/+2
| |
| * More sanity checkingBryan Haase2011-07-221-9/+16
| |
| * Ipsec xAuth patchBryan Haase2011-07-221-0/+16
| |
* | Prevent php from coring if the wrong parameters are passed to ip2longErmal2011-07-271-0/+5
| |
* | Relax PPTP password restrictions, just prevent starting with a !, and limit ↵jim-p2011-07-271-2/+4
| | | | | | | | to common printable/keyboard characters so it doesn't result in invalid xml. Fixes #1720
* | Always send the route delete command even if it fails its ok. This avoids ↵Ermal2011-07-251-10/+3
| | | | | | | | having to dump the routing table.
* | Use the new change to be less distuptiveErmal2011-07-251-1/+1
|/
* removes variables concatenation on gettext stringsVinicius Coque2011-07-181-1/+1
|
* Merge remote-tracking branch 'upstream/master'jim-p2011-07-121-31/+31
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-06-071-6/+5
| |\ | | | | | | | | | | | | | | | Conflicts: etc/inc/voucher.inc usr/local/www/fbegin.inc
| * \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-05-231-1/+2
| |\ \
| * \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-05-231-2/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/interfaces.inc etc/inc/upgrade_config.inc etc/inc/vpn.inc
| * \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-04-151-3/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/gwlb.inc
| * \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-03-251-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/interfaces.inc etc/inc/priv.defs.inc etc/inc/shaper.inc etc/inc/system.inc
| * \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-03-251-27/+36
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc etc/inc/priv.defs.inc etc/inc/services.inc etc/inc/shaper.inc etc/inc/voucher.inc etc/inc/vpn.inc usr/local/www/fbegin.inc
| * \ \ \ \ \ \ Merge branch 'master' into incVinicius Coque2011-01-281-17/+44
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/captiveportal.inc etc/inc/config.console.inc etc/inc/config.lib.inc etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/ipsec.inc etc/inc/pkg-utils.inc etc/inc/shaper.inc etc/inc/system.inc etc/inc/voucher.inc
| * \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incVinicius Coque2010-12-141-16/+26
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/gwlb.inc etc/inc/interfaces.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc etc/inc/shaper.inc etc/inc/upgrade_config.inc etc/inc/xmlparse.inc usr/local/www/fbegin.inc
| * \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-11-161-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/PEAR.inc etc/inc/filter.inc
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-11-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/pkg-utils.inc etc/inc/system.inc
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-11-031-17/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/priv.defs.inc etc/inc/system.inc etc/inc/upgrade_config.inc etc/inc/vpn.inc
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-10-111-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/authgui.inc
| * | | | | | | | | | | | | Fix quotes to use %N$X on gettext callsRenato Botelho2010-10-011-4/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote branch 'mainline/master' into incRenato Botelho2010-09-281-5/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-09-081-43/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/filter.inc etc/inc/pkg-utils.inc etc/inc/service-utils.inc etc/inc/system.inc etc/inc/vpn.inc
| * | | | | | | | | | | | | | | Fix gettext calls with printf to permit change strings orderRenato Botelho2010-08-301-4/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote branch 'mainline/master' into incRenato Botelho2010-08-301-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/interfaces.inc
| * | | | | | | | | | | | | | | | Fix gettext on vpn.incCarlos Eduardo Ramos2010-08-191-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Implement gettext() calls on vpn.incRenato Botelho2010-08-181-32/+32
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge remote branch 'upstream/master'jim-p2011-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Correct event calling during bootup for rc.newipsecdns and also convert the ↵Ermal2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command executed during an ipsec even to go through check_reload_status which will prevent races on calling rc.newipsecdns. Which might lead to many filterdns processes.
* | | | | | | | | | | | | | | | | Merge remote branch 'upstream/master'jim-p2011-06-031-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/openvpn.inc
| * | | | | | | | | | | | | | | | Add a GUI selection for racoon's generate_policy directive since it may be ↵jim-p2011-06-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | useful in certain configurations, especially for mobile clients.
* | | | | | | | | | | | | | | | | Merge remote branch 'upstream/master'jim-p2011-06-011-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | Silence the route changing since it fills the logs with not needed info.Ermal2011-05-271-2/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
OpenPOWER on IntegriCloud