From 5c5ce06ae7bbb558d643902aa64b70321be77316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 7 Dec 2011 18:18:36 +0100 Subject: [PATCH] Feature #862: Make VMs private. VMs from the same group don't show in 'onevm list g' by default. This behaviour can be changed with an ACL rule similar to this one: "@1 VM/@1 INFO" --- src/rm/RequestManagerPoolInfoFilter.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/rm/RequestManagerPoolInfoFilter.cc b/src/rm/RequestManagerPoolInfoFilter.cc index 15d6ff8aa8..d813eccf38 100644 --- a/src/rm/RequestManagerPoolInfoFilter.cc +++ b/src/rm/RequestManagerPoolInfoFilter.cc @@ -110,16 +110,12 @@ void RequestManagerPoolInfoFilter::request_execute( // Default rights: Users can see and use their resources, and // the public ones in their group - uid_filter << "uid = " << att.uid << " OR "; + uid_filter << "uid = " << att.uid; - // VMs don't have public column - if ( auth_object == AuthRequest::VM ) + // VMs don't have public column, are considered private + if ( auth_object != AuthRequest::VM ) { - uid_filter << "gid = " << att.gid; - } - else - { - uid_filter << "(gid = " << att.gid << " AND public = 1)"; + uid_filter << " OR (gid = " << att.gid << " AND public = 1)"; } for ( it=oids.begin(); it< oids.end(); it++ )