summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@xs4all.nl>2009-12-03 11:42:08 +0100
committerSeth Mos <seth.mos@xs4all.nl>2009-12-03 11:42:08 +0100
commitb96cad97eafee7dc4b2cdb143af07f92ff35c68e (patch)
tree8932f6ae279e21ca2122436d45b92249b3f3855c /etc
parent0456d95221912f4b728f2690769b8e1faf3afe56 (diff)
downloadpfsense-b96cad97eafee7dc4b2cdb143af07f92ff35c68e.zip
pfsense-b96cad97eafee7dc4b2cdb143af07f92ff35c68e.tar.gz
Fix missing include for config upgrade 1.2 -> 2.0
Fix missing include for /etc/rc.reload_all
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/config.lib.inc3
-rwxr-xr-xetc/rc.reload_all3
2 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc
index 75820e2..73917c1 100644
--- a/etc/inc/config.lib.inc
+++ b/etc/inc/config.lib.inc
@@ -395,6 +395,7 @@ function convert_config() {
// Save off config version
$prev_version = $config['version'];
+ include_once('auth.inc');
include_once('upgrade_config.inc');
/* Loop and run upgrade_VER_to_VER() until we're at current version */
while ($config['version'] < $g['latest_config']) {
@@ -1248,4 +1249,4 @@ function set_device_perms() {
}
}
-?> \ No newline at end of file
+?>
diff --git a/etc/rc.reload_all b/etc/rc.reload_all
index 8ec6745..3b4b841 100755
--- a/etc/rc.reload_all
+++ b/etc/rc.reload_all
@@ -33,6 +33,7 @@ require_once("config.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("shaper.inc");
+require_once("ipsec.inc");
log_error("rc.reload_all: Reloading all configuration settings.");
reload_all_sync();
@@ -40,4 +41,4 @@ sleep(2);
log_error("rc.reload_all: Reloading filter configuration.");
filter_configure_sync();
-?> \ No newline at end of file
+?>
OpenPOWER on IntegriCloud