diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/server/config.cpp | 6 | ||||
| -rw-r--r-- | server/server/main.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp index 3ee15a8..d4602da 100644 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -4,7 +4,11 @@ config::config(const char *pth) { std::ifstream config; if(!pth) - config.open("./server.cfg", std::fstream::in); + { + std::string cfg_path = boost::filesystem::initial_path().string(); + cfg_path += "/server.cfg"; + config.open(cfg_path.c_str(), std::fstream::in); + } else config.open(pth, std::fstream::in); std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>()); diff --git a/server/server/main.cpp b/server/server/main.cpp index 0c89281..37507a8 100644 --- a/server/server/main.cpp +++ b/server/server/main.cpp @@ -457,13 +457,13 @@ server::server(boost::asio::io_service& io_service, unsigned short port) : io_se // context_.set_password_callback(boost::bind(&server::get_password, this)); context_.set_verify_mode(boost::asio::ssl::context::verify_peer | boost::asio::ssl::context::verify_fail_if_no_peer_cert); tmp_path = b_path; - tmp_path.append("./ca.crt"); + tmp_path.append("/ca.crt"); context_.load_verify_file(tmp_path, err); logger->lock(); *logger << time_str()<<": Openning verify cert: " << tmp_path << " " << err.message()<<"\n"; logger->unlock(); tmp_path = b_path; - tmp_path.append("./server.crt"); + tmp_path.append("/server.crt"); context_.use_certificate_file(tmp_path, boost::asio::ssl::context::pem, err); logger->lock(); *logger << time_str()<<": Openning server cert file: " << tmp_path << " " << err.message()<<"\n"; |