Fix to give the proper target ip on connect, cookies to w00t and Jason

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index ce962fea6af32bce997f21fdaa4c12982b9577f3..8b93be24500e9cb681aaf8d8a7155f2459f088ee 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -128,7 +128,7 @@ void InspIRCd::SendError(const std::string &s)
        {
                if ((*i)->registered == REG_ALL)
                {
-                       (*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str());
+                       (*i)->WriteServ("NOTICE %s :%s",(*i)->nick.c_str(),s.c_str());
                }
                else
                {
@@ -308,10 +308,29 @@ bool InspIRCd::OpenLog(char**, int)
                if (Config->logpath.empty())
                {
                        std::string path = std::string(home) + "/.inspircd";
-                       if (!mkdir(path.c_str(), 0700))
+                       // This tries to create the ~/.inspircd. If it succeeds, then we go ahead and use it.
+                       // If it fails due to an existing target, then we use it anyway.
+                       // Either way, we make sure we can get write access to the log at this point.
+                       if (!mkdir(path.c_str(), 0700) || errno == EEXIST)
                        {
                                /* Log to ~/.inspircd/ircd.log */
                                Config->logpath = path + "/startup.log";
+                               FILE* fd = fopen(Config->logpath.c_str(), "a+");
+                               if (!fd)
+                               {
+                                       // Could not get write access... Why?
+                                       if (errno == ENOTDIR)
+                                               // ~/.inspircd is not actually a directory!
+                                               printf("\nWARNING: Unable to create directory: %s (Exists and is not a directory)\n", path.c_str());
+                                       else
+                                               // Not writable for some other reason (no +w access, readonly fs, file too big, whatever).
+                                               printf("\nWARNING: No write access to %s (%s)\n", Config->logpath.c_str(), strerror(errno));
+                                       Config->logpath = "./startup.log";
+                               }
+                               else
+                               {
+                                       Config->log_file = fd;
+                               }
                        }
                        else
                        {
@@ -321,7 +340,8 @@ bool InspIRCd::OpenLog(char**, int)
                        }
                }
 
-               Config->log_file = fopen(Config->logpath.c_str(),"a+");
+               if (!Config->log_file)
+                       Config->log_file = fopen(Config->logpath.c_str(),"a+");
        }
        else
        {