Skip to content

Commit 6bb2a25

Browse files
Merge pull request #110 from brianhlin/SOFTWARE-4431.fix-authlib-syntax
Fix ofs.authlib append syntax (SOFTWARE-4431)
2 parents f29d008 + 72165ba commit 6bb2a25

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

configs/stash-cache/config.d/50-stash-cache-authz.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ if defined ?StashCacheSciTokensConf && defined ?~XROOTD4
7272
else if defined ?~XROOTD4
7373
ofs.authlib libXrdAccSciTokens.so config=/run/stash-cache-auth/scitokens.conf
7474
else if defined ?StashCacheSciTokensConf
75-
ofs.authlib +++ libXrdAccSciTokens.so config=$StashCacheSciTokensConf
75+
ofs.authlib ++ libXrdAccSciTokens.so config=$StashCacheSciTokensConf
7676
else
77-
ofs.authlib +++ libXrdAccSciTokens.so config=/run/stash-cache-auth/scitokens.conf
77+
ofs.authlib ++ libXrdAccSciTokens.so config=/run/stash-cache-auth/scitokens.conf
7878
fi
7979

8080
# Pass the bearer token to the Xrootd authorization framework.

configs/stash-origin/config.d/50-stash-origin-authz.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ if defined ?StashOriginSciTokensConf && defined ?~XROOTD4
6868
else if defined ?~XROOTD4
6969
ofs.authlib libXrdAccSciTokens.so config=/run/stash-origin-auth/scitokens.conf
7070
else if defined ?StashOriginSciTokensConf
71-
ofs.authlib +++ libXrdAccSciTokens.so config=$StashOriginSciTokensConf
71+
ofs.authlib ++ libXrdAccSciTokens.so config=$StashOriginSciTokensConf
7272
else
73-
ofs.authlib +++ libXrdAccSciTokens.so config=/run/stash-origin-auth/scitokens.conf
73+
ofs.authlib ++ libXrdAccSciTokens.so config=/run/stash-origin-auth/scitokens.conf
7474
fi

rpm/xcache.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: xcache
22
Summary: XCache scripts and configurations
3-
Version: 1.5.4
3+
Version: 1.5.5
44
Release: 1%{?dist}
55
License: Apache 2.0
66
Group: Grid
@@ -292,6 +292,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd
292292
%config %{_sysconfdir}/xrootd/config.d/03-redir-tuning.cfg
293293

294294
%changelog
295+
* Wed Jan 27 2021 Brian Lin <blin@cs.wisc.edu> - 1.5.5-1
296+
- Fix ofs.authlib append syntax (SOFTWARE-4431)
297+
295298
* Tue Jan 26 2021 Brian Lin <blin@cs.wisc.edu> - 1.5.4-1
296299
- Update configuration to append SciTokens to the auth list for XRootD
297300
5+ (SOFTWARE-4431)

0 commit comments

Comments
 (0)