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

Add file mode support for NodeUtility::CreateBackupFile() 

refs #8260
This commit is contained in:
Michael Friedrich 2015-02-07 20:41:04 +01:00
parent 289ca2ec24
commit 1d4065ba94
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cli/nodeutility.cpp
View File

@ -591,7 +591,7 @@ bool NodeUtility::CheckAgainstBlackAndWhiteList(const String& type, const String
/* /*
* We generally don't overwrite files without backup before * We generally don't overwrite files without backup before
*/ */
bool NodeUtility::CreateBackupFile(const String& target) bool NodeUtility::CreateBackupFile(const String& target, mode_t mode)
{ {
if (!Utility::PathExists(target)) if (!Utility::PathExists(target))
return false; return false;
@ -606,6 +606,10 @@ bool NodeUtility::CreateBackupFile(const String& target)
Utility::CopyFile(target, backup); Utility::CopyFile(target, backup);
#ifndef _WIN32
chmod(backup.CStr(), mode);
#endif /* _WIN32 */
Log(LogInformation, "cli") Log(LogInformation, "cli")
<< "Created backup file '" << backup << "'."; << "Created backup file '" << backup << "'.";

2
lib/cli/nodeutility.hpp
View File

@ -51,7 +51,7 @@ public:
static std::vector<Dictionary::Ptr> GetNodes(void); static std::vector<Dictionary::Ptr> GetNodes(void);
static bool CreateBackupFile(const String& target); static bool CreateBackupFile(const String& target, mode_t mode = 0640);
static bool WriteNodeConfigObjects(const String& filename, const Array::Ptr& objects); static bool WriteNodeConfigObjects(const String& filename, const Array::Ptr& objects);