summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2007-02-10 21:26:32 +0000
committerpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2007-02-10 21:26:32 +0000
commitbc47b88daf0552a83611514858ef6388350000b7 (patch)
treebc04419ce2d75ef21c2210840239cd79af91efff
parentac8e7547b831090de3286a2037faf99755e37d39 (diff)
Fix that equal sign '=' inside double quotes don't blow up confcheck.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6567 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--.inspircd.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/.inspircd.inc b/.inspircd.inc
index b474f8438..969c80771 100644
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -366,9 +366,6 @@ sub validateconf
# remove trailing newlines
chomp($i);
- # clean up
- $i =~ s/[^=]+=\s(.*)/\1/;
-
# convert tabs to spaces
$i =~ s/\t/ /g;
@@ -394,8 +391,12 @@ sub validateconf
# remove trailing spaces
$i =~ s/ *$//;
+ # setup incf for include check and clean it up, since this breaks parsing use local var
+ my $incf = $i;
+ $incf =~ s/[^=]+=\s(.*)/\1/;
+
# include file?
- if (($i =~ s/\<include file=\"(.+?)\"\>//i) && ($i !~ /^#/))
+ if (($incf =~ s/\<include file=\"(.+?)\"\>//i) && ($incf !~ /^#/))
{
# yes, process it
validateconf($1);