From 3ff70fabbea9f362bdee1afe5e99986f0feda97b Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Tue, 5 Jul 2011 17:23:08 +0200 Subject: [PATCH] feature #687: oneadmin user and group can use any host --- src/scheduler/include/UserXML.h | 5 +++++ src/scheduler/src/sched/Scheduler.cc | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/scheduler/include/UserXML.h b/src/scheduler/include/UserXML.h index ef791274a0..5413a6751e 100644 --- a/src/scheduler/include/UserXML.h +++ b/src/scheduler/include/UserXML.h @@ -41,6 +41,11 @@ public: return oid; }; + int get_gid() + { + return gid; + }; + set get_groups() { return group_ids; diff --git a/src/scheduler/src/sched/Scheduler.cc b/src/scheduler/src/sched/Scheduler.cc index 98ef72f776..f69931eaa1 100644 --- a/src/scheduler/src/sched/Scheduler.cc +++ b/src/scheduler/src/sched/Scheduler.cc @@ -350,12 +350,19 @@ void Scheduler::match() { set groups = user->get_groups(); - matched = acls->authorize(uid, - groups, - AuthRequest::HOST, - host->get_hid(), - -1, - AuthRequest::USE); + if ( uid == 0 || user->get_gid() == 0 ) + { + matched = true; + } + else + { + matched = acls->authorize(uid, + groups, + AuthRequest::HOST, + host->get_hid(), + -1, + AuthRequest::USE); + } } else {