Skip to content

Commit d11312b

Browse files
committed
conditionalize xrootd policy based on lcmaps version (SOFTWARE-3396)
1 parent d208fa9 commit d11312b

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

osgtest/tests/test_14_lcmaps.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def test_01_configure(self):
2222

2323
def test_02_xrootd_policy(self):
2424
core.skip_ok_unless_installed('xrootd-lcmaps', *self.required_rpms)
25+
core.skip_ok_unless(core.package_version_compare('xrootd-lcmaps', '1.4.0') >= 0)
2526

2627
files.append(core.config['lcmaps.db'],
2728
'''xrootd_policy:

osgtest/tests/test_15_xrootd.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ def test_01_start_xrootd(self):
4949
if all([core.rpm_is_installed(x) for x in lcmaps_packages]):
5050
core.log_message("Using xrootd-lcmaps authentication")
5151
sec_protocol = '-authzfun:libXrdLcmaps.so -authzfunparms:--loglevel,5'
52+
if core.package_version_compare('xrootd-lcmaps', '1.4.0') >= 0:
53+
sec_protocol += ',--policy,authorize_only'
5254
else:
5355
core.log_message("Using XRootD mapfile authentication")
5456
sec_protocol = '-gridmap:/etc/grid-security/xrd/xrdmapfile'

0 commit comments

Comments
 (0)