diff options
| author | Adam <Adam@anope.org> | 2011-03-11 00:47:28 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-03-11 00:47:28 -0500 |
| commit | 1ee3d3d81034c2e2d8c1bf55db8963a50e35f363 (patch) | |
| tree | d8952ff4d27e144eedd63a056971dfc2b1af5411 /src/init.cpp | |
| parent | 97c2e0957d32c87e1055041e43eb13a4a26d0765 (diff) | |
Added os_config and support for including additional configuration files.
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 7b520808b..71ef4b638 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -295,7 +295,7 @@ void Init(int ac, char **av) { if (Arg.empty()) throw FatalException("The --config option requires a file name"); - services_conf = Arg; + services_conf = ConfigurationFile(Arg, false); } if (GetCommandLineArgument("dir", 0, Arg)) @@ -315,9 +315,9 @@ void Init(int ac, char **av) Log(LOG_TERMINAL) << "Anope " << Anope::Version() << ", " << Anope::Build(); #ifdef _WIN32 - Log(LOG_TERMINAL) << "Using configuration file " << services_dir << "\\" << services_conf; + Log(LOG_TERMINAL) << "Using configuration file " << services_dir << "\\" << services_conf.GetName(); #else - Log(LOG_TERMINAL) << "Using configuration file " << services_dir << "/" << services_conf; + Log(LOG_TERMINAL) << "Using configuration file " << services_dir << "/" << services_conf.GetName(); #endif /* Read configuration file; exit if there are problems. */ |