Merge branch 'auth'
* auth: fix osdGetRoles oops Add showauth executable getgrouplist() on OSX has different sig. auth fix mingw static fix search PeerInfo PeerInfo in pva/server.h and pva/sharedstate.h make PeerInfo available during search phase auth status void accidental success. minor doc always need to link with netapi32 now authorize with local group lookup Add osdGetRoles() authorization framework pvasr show PeerInfo redo security (aka. access control) remove asCheck # Conflicts: # src/server/pv/responseHandlers.h # src/server/responseHandlers.cpp
This commit is contained in:
@@ -4164,9 +4164,6 @@ private:
|
||||
|
||||
m_channelSearchManager.reset(new ChannelSearchManager(thisPointer));
|
||||
|
||||
// preinitialize security plugins
|
||||
SecurityPluginRegistry::instance();
|
||||
|
||||
// TODO put memory barrier here... (if not already called within a lock?)
|
||||
|
||||
// setup UDP transport
|
||||
@@ -4448,11 +4445,6 @@ private:
|
||||
}
|
||||
}
|
||||
|
||||
const securityPlugins_t& getSecurityPlugins() OVERRIDE FINAL
|
||||
{
|
||||
return SecurityPluginRegistry::instance().getClientSecurityPlugins();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get channel search manager.
|
||||
* @return channel search manager.
|
||||
|
||||
Reference in New Issue
Block a user