From a091e52ffbf26f3543671812d4ae4d431a6250f2 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 1 Jul 2011 18:54:02 +0200 Subject: [PATCH] feature #687: Redo of commit 2b90f0237700bb5da0ef6603d66dc832cd6abd12 --- src/rm/RequestManagerPoolInfoFilter.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/rm/RequestManagerPoolInfoFilter.cc b/src/rm/RequestManagerPoolInfoFilter.cc index 2049eb785a..b3875a2dc2 100644 --- a/src/rm/RequestManagerPoolInfoFilter.cc +++ b/src/rm/RequestManagerPoolInfoFilter.cc @@ -45,7 +45,6 @@ void RequestManagerPoolInfoFilter::request_execute(xmlrpc_c::paramList const& pa set::iterator it; ostringstream oss; - bool empty = true; ostringstream where_string; @@ -59,6 +58,8 @@ void RequestManagerPoolInfoFilter::request_execute(xmlrpc_c::paramList const& pa int rc; + AuthRequest::Operation request_op; + // ------------------------------------------ // User ID filter // ------------------------------------------ @@ -74,10 +75,11 @@ void RequestManagerPoolInfoFilter::request_execute(xmlrpc_c::paramList const& pa case MINE: uid_filter << "uid = " << uid; - auth_op = AuthRequest::INFO_POOL_MINE; + request_op = AuthRequest::INFO_POOL_MINE; break; case ALL: + request_op = AuthRequest::INFO_POOL; break; case MINE_GROUP: @@ -89,11 +91,13 @@ void RequestManagerPoolInfoFilter::request_execute(xmlrpc_c::paramList const& pa where_string << " OR gid = " << *it; } - auth_op = AuthRequest::INFO_POOL_MINE; + request_op = AuthRequest::INFO_POOL_MINE; break; default: uid_filter << "uid = " << filter_flag; + + request_op = AuthRequest::INFO_POOL; break; } @@ -180,7 +184,7 @@ void RequestManagerPoolInfoFilter::request_execute(xmlrpc_c::paramList const& pa // Authorize & get the pool // ------------------------------------------ - if ( basic_authorization(-1) == false ) + if ( basic_authorization(-1, request_op) == false ) { return; }