Remove obsolete ifdef in m_ssl_gnutls.

[user/henk/code/inspircd.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index d48a1907c9e37ae61ec5c5bc93f227c763365f5f..abccd04084c3d58a0908898c27805bef9f337296 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -39,7 +39,7 @@ bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::
                        return true;
                }
        }
-       
+
        ListenSocket* ll = new ListenSocket(tag, sa);
        if (ll->GetFd() < 0)
        {
@@ -100,18 +100,22 @@ int InspIRCd::BindPorts(FailedPortList& failed_ports)
                {
                        // 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)))
+                       if (path.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());
                                continue;
                        }
 
-                       // Create the bindspec manually (aptosa doesn't work with AF_UNIX yet).
-                       memset(&bindspec, 0, sizeof(bindspec));
-                       bindspec.un.sun_family = AF_UNIX;
-                       memcpy(&bindspec.un.sun_path, path.c_str(), sizeof(bindspec.un.sun_path));
+                       // Check for characters which are problematic in the IRC message format.
+                       if (path.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());
+                               continue;
+                       }
 
+                       irc::sockets::untosa(path, bindspec);
                        if (!BindPort(tag, bindspec, old_ports))
                                failed_ports.push_back(std::make_pair(bindspec, errno));
                        else
@@ -174,6 +178,17 @@ bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::socka
        return false;
 }
 
+bool irc::sockets::untosa(const std::string& path, irc::sockets::sockaddrs& sa)
+{
+       memset(&sa, 0, sizeof(sa));
+       if (path.length() >= sizeof(sa.un.sun_path))
+               return false;
+
+       sa.un.sun_family = AF_UNIX;
+       memcpy(&sa.un.sun_path, path.c_str(), path.length() + 1);
+       return true;
+}
+
 int irc::sockets::sockaddrs::family() const
 {
        return sa.sa_family;