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

[XrdMacaroons] Macaroon build fixes, attempt 2 #784

Merged
merged 2 commits into from
Jul 31, 2018
Merged

[XrdMacaroons] Macaroon build fixes, attempt 2 #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11d4c40
[XrdMacaroons] Fix build failures due to warnings on Fedora rawhide.
bbockelm Jul 31, 2018
76f8a61
[XrdMacaroons] Only require macaroons package on supported platforms.
bbockelm Jul 31, 2018
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
2 changes: 2 additions & 0 deletions packaging/rhel/xrootd.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ BuildRequires: zlib-devel
BuildRequires: ncurses-devel
BuildRequires: libcurl-devel
BuildRequires: libuuid-devel
%if %{have_macaroons}
BuildRequires: libmacaroons-devel
%ensid
BuildRequires: json-c-devel

BuildRequires: python2-devel
Expand Down
4 changes: 2 additions & 2 deletions src/XrdMacaroons/XrdMacaroons.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ XrdAccAuthorize *XrdAccAuthorizeObject(XrdSysLogger *log,
{
return new Macaroons::Authz(log, config, chain_authz);
}
catch (std::runtime_error e)
catch (std::runtime_error &e)
{
XrdSysError err(log, "macaroons");
err.Emsg("Config", "Configuration of Macaroon authorization handler failed", e.what());
Expand All @@ -103,7 +103,7 @@ XrdHttpExtHandler *XrdHttpGetExtHandler(
{
return new Macaroons::Handler(log, config, env, def_authz);
}
catch (std::runtime_error e)
catch (std::runtime_error &e)
{
log->Emsg("Config", "Generation of Macaroon handler failed", e.what());
return NULL;
Expand Down