From d0b28bc90a723cf46d0700d03ec2d90b9ca66adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 23 Aug 2013 18:23:59 +0200 Subject: [PATCH] Feature #1742: When a user is deleted, it is now removed from the secondary groups --- src/rm/RequestManagerDelete.cc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/rm/RequestManagerDelete.cc b/src/rm/RequestManagerDelete.cc index 25e794d948..8d7496689d 100644 --- a/src/rm/RequestManagerDelete.cc +++ b/src/rm/RequestManagerDelete.cc @@ -227,8 +227,11 @@ int ClusterDelete::drop(int oid, PoolObjectSQL * object, string& error_msg) int UserDelete::drop(int oid, PoolObjectSQL * object, string& error_msg) { - User * user = static_cast(object); - int group_id = user->get_gid(); + set group_set; + set::iterator it; + + User * user = static_cast(object); + group_set = user->get_groups(); if (oid == 0) { @@ -244,10 +247,17 @@ int UserDelete::drop(int oid, PoolObjectSQL * object, string& error_msg) if ( rc == 0 ) { - Group * group = gpool->get(group_id, true); + Group * group; - if( group != 0 ) + for ( it = group_set.begin(); it != group_set.end(); it++ ) { + group = gpool->get(*it, true); + + if( group == 0 ) + { + continue; + } + group->del_user(oid); gpool->update(group);