From ff8711592e15245da09475f71feee8e6a0c03c41 Mon Sep 17 00:00:00 2001 From: William Brown Date: Wed, 13 May 2020 14:13:25 +1000 Subject: [PATCH] Add upg to radius --- kanidmd/src/lib/idm/group.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kanidmd/src/lib/idm/group.rs b/kanidmd/src/lib/idm/group.rs index 7a6073f4d..47e71f26b 100644 --- a/kanidmd/src/lib/idm/group.rs +++ b/kanidmd/src/lib/idm/group.rs @@ -22,7 +22,15 @@ pub struct Group { macro_rules! try_from_account_e { ($au:expr, $value:expr, $qs:expr) => {{ - let groups: Vec = match $value.get_ava_reference_uuid("memberof") { + let name = $value.get_ava_single_string("name").ok_or_else(|| { + OperationError::InvalidAccountState("Missing attribute: name".to_string()) + })?; + + let uuid = *$value.get_uuid(); + + let upg = Group { name, uuid }; + + let mut groups: Vec = match $value.get_ava_reference_uuid("memberof") { Some(l) => { // given a list of uuid, make a filter: even if this is empty, the be will // just give and empty result set. @@ -48,6 +56,7 @@ macro_rules! try_from_account_e { vec![] } }; + groups.push(upg); Ok(groups) }}; }