diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-13 20:33:03 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-09-13 20:33:03 +0000 |
| commit | 36a6e7f22e5510d12bd8e11a5b25f29360fbd75c (patch) | |
| tree | 47c1275d272c9ed2dd6e548447651379b9978c6b /include | |
| parent | 4d1e32528fcf9a44011184a99cff7493e363b400 (diff) | |
Prevent <include:executable> from running <include:executable> itself [jackmcbarn]
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11710 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configreader.h b/include/configreader.h index c8cd13081..45384b8a3 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -140,7 +140,7 @@ class CoreExport ServerConfig : public classbase * configutation, appending errors to errorstream * and setting error if an error has occured. */ - bool ParseLine(const std::string &filename, std::string &line, long &linenumber); + bool ParseLine(const std::string &filename, std::string &line, long &linenumber, bool allowexeinc); /** Check that there is only one of each configuration item */ @@ -156,7 +156,7 @@ class CoreExport ServerConfig : public classbase /** Process an include file directive */ - bool DoInclude(const std::string &file); + bool DoInclude(const std::string &file, bool allowexeinc); /** Error stream, contains error output from any failed configuration parsing. */ @@ -618,12 +618,12 @@ class CoreExport ServerConfig : public classbase /** Load 'filename' into 'target', with the new config parser everything is parsed into * tag/key/value at load-time rather than at read-value time. */ - bool LoadConf(FILE* &conf, const char* filename); + bool LoadConf(FILE* &conf, const char* filename, bool allowexeinc); /** Load 'filename' into 'target', with the new config parser everything is parsed into * tag/key/value at load-time rather than at read-value time. */ - bool LoadConf(FILE* &conf, const std::string &filename); + bool LoadConf(FILE* &conf, const std::string &filename, bool allowexeinc); /** Writes 'length' chars into 'result' as a string */ |