diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-08-14 03:50:37 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-08-14 03:50:37 +0000 |
| commit | d2b7068413aefef4d38c7b2580f26091213313b3 (patch) | |
| tree | a519aeca4deb8cc96a2c5c5a8135b4f0c756e4fe | |
| parent | 0394c8169a0bb7d4347117d42d97ed1a0bec8be6 (diff) | |
| download | pfsense-d2b7068413aefef4d38c7b2580f26091213313b3.zip pfsense-d2b7068413aefef4d38c7b2580f26091213313b3.tar.gz | |
config_validate requires a config file, not a file stream.
Noticed-by: BillM
| -rw-r--r-- | etc/inc/config.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 40c3396..ebf5d3b 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -70,7 +70,7 @@ if(file_exists("/cf/conf/config.xml")) { /* user has just upgraded to m0n0wall, replace root xml tags */ log_error("Upgrading m0n0wall configuration to pfSense... "); $config_contents = str_replace("m0n0wall","pfsense", $config_contents); - if (!config_validate($config_contents)) + if (!config_validate("{$g['conf_path']}/config.xml")) log_error("ERROR! Could not convert m0n0wall -> pfsense in config.xml"); conf_mount_rw(); $fd = fopen("/cf/conf/config.xml", "w"); |
