From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Mon, 28 May 2007 08:32:33 +0000 (+0000)
Subject: do not double check authorization (checked in JobStatus() if called)
X-Git-Tag: glite-yaim-lb_R_3_1_1-1~83
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=fd81baff3d361cbc60e857011bfcbac6dcd3e181;p=jra1mw.git

do not double check authorization (checked in JobStatus() if called)
---

diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c
index 802e945..0a18187 100644
--- a/org.glite.lb.server/src/query.c
+++ b/org.glite.lb.server/src/query.c
@@ -171,6 +171,8 @@ int edg_wll_QueryEventsServer(
 			if (where_flags & FL_FILTER) {
 				edg_wll_JobStat state_out;
 
+				// XXX: possible optimalization: do not count JobStatus for all events
+				//	but only for different jobIds
 				if ( edg_wll_JobStatus(ctx, out[i].any.jobId, 0, &state_out) )
 				{
 					edg_wll_FreeEvent(out+i);
@@ -189,8 +191,8 @@ int edg_wll_QueryEventsServer(
 				edg_wll_FreeStatus(&state_out);
 			}
 
-
-			if ( !noAuth )
+			// Auth checked in edg_wll_JobStatus above
+			if ( !(where_flags & FL_FILTER) && !noAuth )
 			{
 				if (!ctx->peerName || strcmp(res[1],strmd5(ctx->peerName,NULL))) {
 					edg_wll_Acl	acl = NULL;