Skip to content

Commit d208fa9

Browse files
committed
Revert "set xrootd-lcmaps policy in sec_protocol (SOFTWARE-3396)"
This reverts commit 325016d.
1 parent 01af4b3 commit d208fa9

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

osgtest/tests/test_14_lcmaps.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,16 @@ def test_01_configure(self):
2020
"globus_mapping liblcas_lcmaps_gt4_mapping.so lcmaps_callout\n",
2121
owner='lcmaps')
2222

23+
def test_02_xrootd_policy(self):
24+
core.skip_ok_unless_installed('xrootd-lcmaps', *self.required_rpms)
25+
26+
files.append(core.config['lcmaps.db'],
27+
'''xrootd_policy:
28+
verifyproxynokey -> banfile
29+
banfile -> banvomsfile | bad
30+
banvomsfile -> gridmapfile | bad
31+
gridmapfile -> good | vomsmapfile
32+
vomsmapfile -> good | defaultmapfile
33+
defaultmapfile -> good | bad
34+
''',
35+
backup=False)

osgtest/tests/test_15_xrootd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def test_01_start_xrootd(self):
4848
lcmaps_packages = ('lcmaps', 'lcmaps-db-templates', 'xrootd-lcmaps', 'vo-client', 'vo-client-lcmaps-voms')
4949
if all([core.rpm_is_installed(x) for x in lcmaps_packages]):
5050
core.log_message("Using xrootd-lcmaps authentication")
51-
sec_protocol = '-authzfun:libXrdLcmaps.so -authzfunparms:--loglevel,5,--policy,authorize_only'
51+
sec_protocol = '-authzfun:libXrdLcmaps.so -authzfunparms:--loglevel,5'
5252
else:
5353
core.log_message("Using XRootD mapfile authentication")
5454
sec_protocol = '-gridmap:/etc/grid-security/xrd/xrdmapfile'

0 commit comments

Comments
 (0)