apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-03 03:41:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Evan Tschannen 2018-05-10 09:13:41 -07:00
parent 8f984cb2c9
commit 7bca7b80e6
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbrpc/TLSConnection.actor.cpp
View File

@ -402,5 +402,5 @@ void TLSOptions::init_plugin( std::string const& plugin_path ) {
}
bool TLSOptions::enabled() {
return !!policy;
return !!policyVerifyPeersSet && !!policyVerifyPeersNotSet;
}

6
fdbrpc/TLSConnection.h
View File

@ -97,12 +97,8 @@ struct TLSOptions : ReferenceCounted<TLSOptions> {
void register_network();
<<<<<<< HEAD
Reference<ITLSPolicy> get_policy();
bool enabled();
=======
Reference<ITLSPolicy> get_policy(PolicyType type);
>>>>>>> release-5.2
bool enabled();
private:
void init_plugin( std::string const& plugin_path = "" );