Commit Graph

16 Commits

Author SHA1 Message Date
Darren Embry
428c289fb4 allow null to be passed as 2nd arg to parse_config_xml*
in which case entire config is returned
2012-05-17 17:30:24 -04:00
Vinicius Coque
9d3d8d005e Merge branch 'master' into inc
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
2011-01-28 17:32:17 -02:00
smos
71f88d75b9 Add the npt tag which is used by the IPv6 tree to the 2.0 mainline tree.
This prevents a config blowup when a ipv6 config loads on 2.0.
2011-01-24 08:34:16 +01:00
Vinicius Coque
c92ccac76f Merge remote branch 'mainline/master' into inc
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
2010-12-14 09:56:34 -02:00
Erik Fonnesbeck
990d7c037c Check for pfsense root object name in config.xml as a fallback if the configured name is not found. 2010-11-26 15:57:55 -07:00
Scott Ullrich
9734b0545e Remove trailing carriage return 2010-11-10 12:00:32 -05:00
Renato Botelho
8c04b1ae0a Merge remote branch 'mainline/master' into inc
Conflicts:
	etc/inc/filter.inc
	etc/inc/pkg-utils.inc
	etc/inc/service-utils.inc
	etc/inc/system.inc
	etc/inc/vpn.inc
2010-09-08 10:20:04 -03:00
Ermal
0e642c78b4 Make possible to run multiple instances of pppoe server. Not yet switched to mpd4. 2010-09-02 17:27:14 +00:00
Renato Botelho
5e56c56dba Merge remote branch 'mainline/master' into inc
Conflicts:
	etc/inc/captiveportal.inc
2010-08-30 19:36:59 -03:00
jim-p
6733f0f90f Add crl as a listtag 2010-08-30 17:31:16 -04:00
Renato Botelho
5cfa35dfe4 Fix syntax 2010-08-17 14:17:46 -03:00
Renato Botelho
61349b3fa8 Implement gettext() on xmlreader.inc 2010-08-17 09:36:17 -03:00
Ermal
e08e4ebc69 Make list the same. Remove whitespace at the end so it does not get interpreted as special tag. 2010-05-07 13:27:43 +00:00
Ermal
ab83fce093 Ticket #320. Use xmlreader and xmlwriter to read/write xml since it encodes decodes itself special chars. 2010-05-06 16:34:20 +00:00
Erik Fonnesbeck
9f428275e9 Add page for configuration of wireless clone interfaces. 2010-02-15 01:44:25 -07:00
Scott Ullrich
26433cb842 Adding newer xmlreader code to it's own file so that it can be turned and off until remaining bugs are fixed 2009-11-06 22:28:00 -05:00