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:
@@ -17,6 +17,7 @@
|
||||
#define epicsExportSharedSymbols
|
||||
#include "pva/server.h"
|
||||
#include "pv/pvAccess.h"
|
||||
#include "pv/security.h"
|
||||
#include "pv/reftrack.h"
|
||||
|
||||
namespace pvd = epics::pvData;
|
||||
@@ -216,8 +217,9 @@ struct DynamicProvider::Impl : public pva::ChannelProvider
|
||||
{
|
||||
bool found = false;
|
||||
{
|
||||
pva::PeerInfo::const_shared_pointer info(requester->getPeerInfo());
|
||||
search_type search;
|
||||
search.push_back(DynamicProvider::Search(name));
|
||||
search.push_back(DynamicProvider::Search(name, info ? info.get() : 0));
|
||||
|
||||
handler->hasChannels(search);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user