Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unique_ptr and correct ObjAdd function parameters #1380

Merged
merged 1 commit into from
Jan 6, 2021
Merged

Remove unique_ptr and correct ObjAdd function parameters #1380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/XrdSciTokens/src/XrdAccSciTokens.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper
};

public:
XrdAccSciTokens(XrdSysLogger *lp, const char *parms, std::unique_ptr<XrdAccAuthorize> chain) :
m_chain(std::move(chain)),
XrdAccSciTokens(XrdSysLogger *lp, const char *parms, XrdAccAuthorize* chain) :
m_chain(chain),
m_parms(parms ? parms : ""),
m_next_clean(monotonic_time() + m_expiry_secs),
m_log(lp, "scitokens_")
Expand Down Expand Up @@ -471,8 +471,7 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper
XrdAccAuthorize *accP)
{
try {
std::unique_ptr<XrdAccAuthorize> chain(accP);
accSciTokens = new XrdAccSciTokens(lp, parm, std::move(chain)); // The last arg not needed!
accSciTokens = new XrdAccSciTokens(lp, parm, accP); // The last arg not needed!
return (XrdSciTokensHelper*)accSciTokens;
} catch (std::exception &) {
return nullptr;
Expand Down Expand Up @@ -950,7 +949,7 @@ class XrdAccSciTokens : public XrdAccAuthorize, public XrdSciTokensHelper
std::vector<std::string> m_audiences;
std::vector<const char *> m_audiences_array;
std::map<std::string, std::shared_ptr<XrdAccRules>> m_map;
std::unique_ptr<XrdAccAuthorize> m_chain;
XrdAccAuthorize* m_chain;
const std::string m_parms;
std::vector<const char*> m_valid_issuers_array;
std::unordered_map<std::string, IssuerConfig> m_issuers;
Expand All @@ -969,6 +968,7 @@ extern "C" {
XrdAccAuthorize *XrdAccAuthorizeObjAdd(XrdSysLogger *lp,
const char *cfn,
const char *parm,
XrdOucEnv * /*not used*/,
XrdAccAuthorize *accP)
{
// Record the parent authorization plugin. There is no need to use
Expand Down Expand Up @@ -1003,7 +1003,7 @@ XrdAccAuthorize *XrdAccAuthorizeObject(XrdSysLogger *lp,
const char *cfn,
const char *parm)
{
return XrdAccAuthorizeObjAdd(lp, cfn, parm, 0);
return XrdAccAuthorizeObjAdd(lp, cfn, parm, 0, 0);
}


Expand Down