diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/listensocket.cpp | 7 | ||||
| -rw-r--r-- | src/socket.cpp | 17 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/listensocket.cpp b/src/listensocket.cpp index 60ee0b449..3d6b11568 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -66,6 +66,13 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t #endif } + if (bind_to.family() == AF_UNIX) + { + unsigned int permissions = tag->getUInt("permissions", 0, 0, 777); + if (permissions) + chmod(bind_to.str().c_str(), permissions); + } + SocketEngine::SetReuse(fd); int rv = SocketEngine::Bind(this->fd, bind_to); if (rv >= 0) diff --git a/src/socket.cpp b/src/socket.cpp index 2daa6a821..26b5aeee3 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -98,24 +98,31 @@ int InspIRCd::BindPorts(FailedPortList& failed_ports) const std::string path = tag->getString("path"); if (!path.empty()) { + // Expand the path relative to the config directory. + const std::string fullpath = ServerInstance->Config->Paths.PrependData(path); + // UNIX socket paths are length limited to less than PATH_MAX. irc::sockets::sockaddrs bindspec; - if (path.length() > std::min(ServerInstance->Config->Limits.MaxHost, sizeof(bindspec.un.sun_path) - 1)) + if (fullpath.length() > std::min(ServerInstance->Config->Limits.MaxHost, sizeof(bindspec.un.sun_path) - 1)) { this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path that is too long!", - path.c_str(), tag->getTagLocation().c_str()); + fullpath.c_str(), tag->getTagLocation().c_str()); continue; } // Check for characters which are problematic in the IRC message format. - if (path.find_first_of("\n\r\t!@: ") != std::string::npos) + if (fullpath.find_first_of("\n\r\t!@: ") != std::string::npos) { this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path containing invalid characters!", - path.c_str(), tag->getTagLocation().c_str()); + fullpath.c_str(), tag->getTagLocation().c_str()); continue; } - irc::sockets::untosa(path, bindspec); + const bool replace = tag->getBool("replace"); + if (replace && irc::sockets::isunix(fullpath)) + remove(fullpath.c_str()); + + irc::sockets::untosa(fullpath, bindspec); if (!BindPort(tag, bindspec, old_ports)) failed_ports.push_back(std::make_pair(bindspec, errno)); else |