From f66538ff95fcb4867c3e5116c0349eabc756d747 Mon Sep 17 00:00:00 2001 From: Michael Davis <michael.davis@cern.ch> Date: Thu, 25 Jan 2018 11:52:41 +0100 Subject: [PATCH] [xrd_ssi] No need to specialize on Service::Prepare --- xroot_plugins/XrdSsiCtaServiceProvider.cpp | 51 ---------------------- 1 file changed, 51 deletions(-) diff --git a/xroot_plugins/XrdSsiCtaServiceProvider.cpp b/xroot_plugins/XrdSsiCtaServiceProvider.cpp index aeed04b59d..f31cd337dc 100644 --- a/xroot_plugins/XrdSsiCtaServiceProvider.cpp +++ b/xroot_plugins/XrdSsiCtaServiceProvider.cpp @@ -50,57 +50,6 @@ XrdSsiProvider *XrdSsiProviderServer = new XrdSsiCtaServiceProvider; -namespace XrdSsiPb { - -/*! - * Override the Service::Prepare method - * - * Ensures that resource.client->name is valid. This is obtained from the KRB5 or SSS key, so - * connections via unix sockets are not possible in this scheme. - */ -template<> -bool Service<cta::xrd::Request, cta::xrd::Response, cta::xrd::Alert>::Prepare(XrdSsiErrInfo &eInfo, const XrdSsiResource &resource) -{ - if(resource.client == nullptr || resource.client->name == nullptr) - { - eInfo.Set("Service::Prepare(): XRootD client name is not set. " - "Possible misconfiguration of the KRB5 or SSS keyfile.", EACCES); - return false; - } - -#ifdef XRDSSI_DEBUG - std::cerr << "[DEBUG] Service::Prepare():" << std::endl; - std::cerr << "[DEBUG] Resource name: " << resource.rName << std::endl - << "[DEBUG] Resource user: " << resource.rUser << std::endl - << "[DEBUG] Resource info: " << resource.rInfo << std::endl - << "[DEBUG] Hosts to avoid: " << resource.hAvoid << std::endl - << "[DEBUG] Affinity: "; - - switch(resource.affinity) - { - case XrdSsiResource::None: std::cerr << "None" << std::endl; break; - case XrdSsiResource::Default: std::cerr << "Default" << std::endl; break; - case XrdSsiResource::Weak: std::cerr << "Weak" << std::endl; break; - case XrdSsiResource::Strong: std::cerr << "Strong" << std::endl; break; - case XrdSsiResource::Strict: std::cerr << "Strict" << std::endl; break; - } - - std::cerr << "[DEBUG] Resource options: " - << (resource.rOpts & XrdSsiResource::Reusable ? "Resuable " : "") - << (resource.rOpts & XrdSsiResource::Discard ? "Discard" : "") - << std::endl; - - std::cerr << "[DEBUG] Resource client protocol: " << resource.client->prot << std::endl; - std::cerr << "[DEBUG] Resource client name: " << resource.client->name << std::endl; -#endif - - return true; -} - -} // namespace XrdSsiPb - - - /*! * Initialise the Service Provider */ -- GitLab