Convert InspIRCd::SetSignals to a static function.

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 5ecaab460c4850949e689bff6b5baa77afedfee5..4805b77176e0f2f36c5d423017c2da713c620139 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -29,6 +29,15 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        : bind_tag(tag)
        , bind_sa(bind_to)
 {
+       // Are we creating a UNIX socket?
+       if (bind_to.family() == AF_UNIX)
+       {
+               // Is 'replace' enabled?
+               const bool replace = tag->getBool("replace");
+               if (replace && irc::sockets::isunix(bind_to.str()))
+                       unlink(bind_to.str().c_str());
+       }
+
        fd = socket(bind_to.family(), SOCK_STREAM, 0);
 
        if (this->fd == -1)
@@ -66,6 +75,14 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 #endif
        }
 
+       if (bind_to.family() == AF_UNIX)
+       {
+               const std::string permissionstr = tag->getString("permissions");
+               unsigned int permissions = strtoul(permissionstr.c_str(), NULL, 8);
+               if (permissions && permissions <= 07777)
+                       chmod(bind_to.str().c_str(), permissions);
+       }
+
        SocketEngine::SetReuse(fd);
        int rv = SocketEngine::Bind(this->fd, bind_to);
        if (rv >= 0)
@@ -183,7 +200,7 @@ void ListenSocket::OnEventHandlerRead()
        if (res == MOD_RES_PASSTHRU)
        {
                std::string type = bind_tag->getString("type", "clients");
-               if (type == "clients")
+               if (stdalgo::string::equalsci(type, "clients"))
                {
                        ServerInstance->Users->AddUser(incomingSockfd, this, &client, &server);
                        res = MOD_RES_ALLOW;