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

Fix pki new-ca not checking for existing ca files 

fixes #10677
This commit is contained in:
Michael Friedrich 2015-11-19 17:06:41 +01:00
parent 9f348c63f2
commit aaa9715a67
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/cli/pkiutility.cpp
View File

@ -45,17 +45,20 @@ String PkiUtility::GetLocalCaPath(void)
int PkiUtility::NewCa(void) int PkiUtility::NewCa(void)
{ {
String cadir = GetLocalCaPath(); String caDir = GetLocalCaPath();
String caCertFile = caDir + "/ca.crt";
String caKeyFile = caDir + "/ca.key";
String caSerialFile = caDir + "/serial.txt";
if (Utility::PathExists(cadir)) { if (Utility::PathExists(caCertFile) && Utility::PathExists(caKeyFile)) {
Log(LogCritical, "cli") Log(LogCritical, "cli")
<< "CA directory '" << cadir << "' already exists."; << "CA files '" << caCertFile << "' and '" << caKeyFile << "'already exist.";
return 1; return 1;
} }
Utility::MkDirP(cadir, 0700); Utility::MkDirP(caDir, 0700);
MakeX509CSR("Icinga CA", cadir + "/ca.key", String(), cadir + "/ca.crt", cadir + "/serial.txt", true); MakeX509CSR("Icinga CA", caKeyFile, String(), caCertFile, caSerialFile, true);
return 0; return 0;
} }