From ddab94feb35050d4e50ab13a1958e65dfbc058b6 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 7 Mar 2018 09:56:42 +0100 Subject: [PATCH] Build fix --- lib/base/netstring.hpp | 2 +- lib/base/tlsutility.hpp | 4 ++-- lib/remote/jsonrpc.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/base/netstring.hpp b/lib/base/netstring.hpp index 045ef5b0b..a8aa91c4e 100644 --- a/lib/base/netstring.hpp +++ b/lib/base/netstring.hpp @@ -40,7 +40,7 @@ class I2_BASE_API NetString public: static StreamReadStatus ReadStringFromStream(const Stream::Ptr& stream, String *message, StreamReadContext& context, bool may_wait = false, ssize_t maxMessageLength = -1); - static size_t WriteStringToStream(const Stream::Ptr& stream, const String& message); + static void WriteStringToStream(const Stream::Ptr& stream, const String& message); static void WriteStringToStream(std::ostream& stream, const String& message); private: diff --git a/lib/base/tlsutility.hpp b/lib/base/tlsutility.hpp index 6e5c68d29..21cb6ffa0 100644 --- a/lib/base/tlsutility.hpp +++ b/lib/base/tlsutility.hpp @@ -57,8 +57,8 @@ String I2_BASE_API SHA1(const String& s, bool binary = false); String I2_BASE_API SHA256(const String& s); String I2_BASE_API RandomString(int length); bool I2_BASE_API VerifyCertificate(const boost::shared_ptr& caCertificate, const boost::shared_ptr& certificate); -bool ComparePassword(const String& hash, const String& password, const String& Salt); -String CreateHashedPasswordString(const String& password, const String& salt, int algorithm = 5); +bool I2_BASE_API ComparePassword(const String& hash, const String& password, const String& Salt); +String I2_BASE_API CreateHashedPasswordString(const String& password, const String& salt, int algorithm = 5); class I2_BASE_API openssl_error : virtual public std::exception, virtual public boost::exception { }; diff --git a/lib/remote/jsonrpc.hpp b/lib/remote/jsonrpc.hpp index 6ab83e35f..6463ca2ea 100644 --- a/lib/remote/jsonrpc.hpp +++ b/lib/remote/jsonrpc.hpp @@ -35,7 +35,7 @@ namespace icinga class I2_REMOTE_API JsonRpc { public: - static size_t SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& message); + static void SendMessage(const Stream::Ptr& stream, const Dictionary::Ptr& message); static StreamReadStatus ReadMessage(const Stream::Ptr& stream, String *message, StreamReadContext& src, bool may_wait = false, ssize_t maxMessageLength = -1); static Dictionary::Ptr DecodeMessage(const String& message); -- 2.50.1