tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash on startup with incorrect directory permissions 

fixes #10739
This commit is contained in:
Michael Friedrich 2015-12-08 15:12:13 +01:00
parent 774f0d3b11
commit 833e28025a
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/base/application.cpp
View File

@ -671,7 +671,17 @@ void Application::SigAbrtHandler(int)
<< std::endl; << std::endl;
String fname = GetCrashReportFilename(); String fname = GetCrashReportFilename();
Utility::MkDir(Utility::DirName(fname), 0750); String dirName = Utility::DirName(fname);
if (!Utility::PathExists(dirName)) {
#ifndef _WIN32
if (mkdir(dirName.CStr(), 0700) < 0 && errno != EEXIST) {
#else /*_ WIN32 */
if (mkdir(dirName.CStr()) < 0 && errno != EEXIST) {
#endif /* _WIN32 */
std::cerr << "Could not create directory '" << dirName << "': Error " << errno << ", " << strerror(errno) << "\n";
}
}
bool interactive_debugger = Convert::ToBool(ScriptGlobal::Get("AttachDebugger")); bool interactive_debugger = Convert::ToBool(ScriptGlobal::Get("AttachDebugger"));
@ -693,7 +703,7 @@ void Application::SigAbrtHandler(int)
ofs << "\n"; ofs << "\n";
ofs.close(); ofs.close();
} else { } else {
Log(LogCritical, "Application", "Icinga 2 has terminated unexpeectedly. Attaching debugger..."); Log(LogCritical, "Application", "Icinga 2 has terminated unexpectedly. Attaching debugger...");
} }
AttachDebugger(fname, interactive_debugger); AttachDebugger(fname, interactive_debugger);
@ -737,11 +747,21 @@ void Application::ExceptionHandler(void)
#endif /* _WIN32 */ #endif /* _WIN32 */
String fname = GetCrashReportFilename(); String fname = GetCrashReportFilename();
Utility::MkDir(Utility::DirName(fname), 0750); String dirName = Utility::DirName(fname);
if (!Utility::PathExists(dirName)) {
#ifndef _WIN32
if (mkdir(dirName.CStr(), 0700) < 0 && errno != EEXIST) {
#else /*_ WIN32 */
if (mkdir(dirName.CStr()) < 0 && errno != EEXIST) {
#endif /* _WIN32 */
std::cerr << "Could not create directory '" << dirName << "': Error " << errno << ", " << strerror(errno) << "\n";
}
}
bool interactive_debugger = Convert::ToBool(ScriptGlobal::Get("AttachDebugger")); bool interactive_debugger = Convert::ToBool(ScriptGlobal::Get("AttachDebugger"));
if (interactive_debugger) { if (!interactive_debugger) {
std::ofstream ofs; std::ofstream ofs;
ofs.open(fname.CStr()); ofs.open(fname.CStr());
@ -783,7 +803,17 @@ LONG CALLBACK Application::SEHUnhandledExceptionFilter(PEXCEPTION_POINTERS exi)
l_InExceptionHandler = true; l_InExceptionHandler = true;
String fname = GetCrashReportFilename(); String fname = GetCrashReportFilename();
Utility::MkDir(Utility::DirName(fname), 0750); String dirName = Utility::DirName(fname);
if (!Utility::PathExists(dirName)) {
#ifndef _WIN32
if (mkdir(dirName.CStr(), 0700) < 0 && errno != EEXIST) {
#else /*_ WIN32 */
if (mkdir(dirName.CStr()) < 0 && errno != EEXIST) {
#endif /* _WIN32 */
std::cerr << "Could not create directory '" << dirName << "': Error " << errno << ", " << strerror(errno) << "\n";
}
}
std::ofstream ofs; std::ofstream ofs;
ofs.open(fname.CStr()); ofs.open(fname.CStr());