From 62f437b7269588d00d05ecb490cadbecb8cd54a6 Mon Sep 17 00:00:00 2001 From: Brian Bockelman Date: Thu, 12 Jan 2023 12:50:30 -0600 Subject: [PATCH] Add a default value for "role" which should handle VOMS attributes where role is missing entirely --- src/XrdVoms/XrdVomsMapfile.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/XrdVoms/XrdVomsMapfile.cc b/src/XrdVoms/XrdVomsMapfile.cc index 824edd94a49..8ffbe921875 100644 --- a/src/XrdVoms/XrdVomsMapfile.cc +++ b/src/XrdVoms/XrdVomsMapfile.cc @@ -269,11 +269,11 @@ XrdVomsMapfile::Apply(XrdSecEntity &entity) int from_vorg = 0, from_role = 0, from_grps = 0; XrdOucString vorg = entity.vorg, entry_vorg; - XrdOucString role = entity.role, entry_role; + XrdOucString role = entity.role ? entity.role : "", entry_role = "NULL"; XrdOucString grps = entity.grps, entry_grps; if (m_edest) m_edest->Log(LogMask::Debug, "VOMSMapfile", "Applying VOMS mapfile to incoming credential"); while (((from_vorg = vorg.tokenize(entry_vorg, from_vorg, ' ')) != -1) && - ((from_role = role.tokenize(entry_role, from_role, ' ')) != -1) && + ((role == "") || (from_role = role.tokenize(entry_role, from_role, ' ')) != -1) && ((from_grps = grps.tokenize(entry_grps, from_grps, ' ')) != -1)) { auto fqan = MakePath(entry_grps);