From: root Date: Wed, 18 Jan 2017 18:44:37 +0000 (+1300) Subject: Update stub_libsecurity after Security::PeerOptions changes X-Git-Tag: M-staged-PR71~284^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed4107c6b933e614edb7f776057c895deffaede0;p=thirdparty%2Fsquid.git Update stub_libsecurity after Security::PeerOptions changes --- diff --git a/src/tests/stub_libsecurity.cc b/src/tests/stub_libsecurity.cc index 6cb4af8d08..a9f8f4f1e2 100644 --- a/src/tests/stub_libsecurity.cc +++ b/src/tests/stub_libsecurity.cc @@ -68,8 +68,13 @@ void PeerConnector::recordNegotiationDetails() STUB #include "security/PeerOptions.h" Security::PeerOptions Security::ProxyOutgoingConfig; -//Security::PeerOptions::PeerOptions() STUB -//Security::PeerOptions::PeerOptions(const Security::PeerOptions &) STUB +Security::PeerOptions::PeerOptions() { +#if !USE_GNUTLS + parsedOptions = 0; +#endif + STUB_NOP +} +Security::PeerOptions::PeerOptions(const Security::PeerOptions &) {STUB} Security::PeerOptions &Security::PeerOptions::operator =(const Security::PeerOptions &) STUB_RETVAL(*this) void Security::PeerOptions::parse(char const*) STUB Security::ContextPointer Security::PeerOptions::createClientContext(bool) STUB_RETVAL(Security::ContextPointer()) @@ -79,6 +84,7 @@ void Security::PeerOptions::updateContextCa(Security::ContextPointer &) STUB void Security::PeerOptions::updateContextCrl(Security::ContextPointer &) STUB void Security::PeerOptions::updateSessionOptions(Security::SessionPointer &) STUB void Security::PeerOptions::dumpCfg(Packable*, char const*) const STUB +void Security::PeerOptions::parseOptions() STUB void parse_securePeerOptions(Security::PeerOptions *) STUB #include "security/ServerOptions.h"