Fix missing stats for current_concurrent_checks via REST API

[icinga2] / lib / remote / pkiutility.hpp

diff --git a/lib/remote/pkiutility.hpp b/lib/remote/pkiutility.hpp
index 5cd98eb5e6f0d8ca426d7d296c654c0c810e690e..50d47e01a7420a81e271f34c1a22e01553491873 100644 (file)
--- a/lib/remote/pkiutility.hpp
+++ b/lib/remote/pkiutility.hpp
@@ -1,29 +1,14 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
- *                                                                            *
- * This program is free software; you can redistribute it and/or              *
- * modify it under the terms of the GNU General Public License                *
- * as published by the Free Software Foundation; either version 2             *
- * of the License, or (at your option) any later version.                     *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #ifndef PKIUTILITY_H
 #define PKIUTILITY_H
 
 #include "remote/i2-remote.hpp"
+#include "base/exception.hpp"
 #include "base/dictionary.hpp"
 #include "base/string.hpp"
 #include <openssl/x509v3.h>
+#include <memory>
 
 namespace icinga
 {
@@ -34,7 +19,7 @@ namespace icinga
 class PkiUtility
 {
 public:
-       static int NewCa(void);
+       static int NewCa();
        static int NewCert(const String& cn, const String& keyfile, const String& csrfile, const String& certfile);
        static int SignCsr(const String& csrfile, const String& certfile);
        static std::shared_ptr<X509> FetchCert(const String& host, const String& port);
@@ -44,10 +29,10 @@ public:
                const String& certfile, const String& cafile, const std::shared_ptr<X509>& trustedcert,
                const String& ticket = String());
        static String GetCertificateInformation(const std::shared_ptr<X509>& certificate);
-       static Dictionary::Ptr GetCertificateRequests(void);
+       static Dictionary::Ptr GetCertificateRequests(bool removed = false);
 
 private:
-       PkiUtility(void);
+       PkiUtility();
 
 };