From 25932543bd16c2d9c8852663932bbe25d02dd9ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Mon, 17 Dec 2007 14:32:25 +0000 Subject: [PATCH] singular match case: no "other" attributes retrieved => no match --- org.glite.jp.primary/src/feed.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/org.glite.jp.primary/src/feed.c b/org.glite.jp.primary/src/feed.c index be9ab1f..aebebdd 100644 --- a/org.glite.jp.primary/src/feed.c +++ b/org.glite.jp.primary/src/feed.c @@ -561,12 +561,13 @@ static int feed_query_callback( } /* filter on non-meta query items */ - if (other) - for (i=0; inother_qry; i++) { - for (j=0; other[j].name; j++) - if (check_qry_item(ctx,f->other_qry+i,other+j)) break; - if (!other[j].name) goto cleanup; /* no match is not an error */ - } + if (f->nother_qry && !other) goto cleanup; /* unknown values can't match */ + + for (i=0; inother_qry; i++) { + for (j=0; other[j].name; j++) + if (check_qry_item(ctx,f->other_qry+i,other+j)) break; + if (!other[j].name) goto cleanup; /* no match is not an error */ + } /* extract attributes to be fed, stack the job for a batch feed */ for (i=0; meta && meta[i].name; i++) -- 1.8.2.3