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

Build fix

This commit is contained in:
Gunnar Beutner 2018-03-07 09:56:42 +01:00
parent f357439485
commit ddab94feb3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/netstring.hpp
View File

@ -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:

4
lib/base/tlsutility.hpp
View File

@ -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<X509>& caCertificate, const boost::shared_ptr<X509>& 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 { };

2
lib/remote/jsonrpc.hpp
View File

@ -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);