Commit 2424c7fc authored by Leigh B Stoller's avatar Leigh B Stoller

Couple of little fixes;

* When resolving a component, return the gif (certificate) of the
  authority it belongs to.

* Quick fix for skiping links that are for another CM. This will
  change later when the schema defines it.
parent 277f4a62
......@@ -281,10 +281,12 @@ sub Resolve($)
return GeniResponse->Create(GENIRESPONSE_SEARCHFAILED, undef,
"No such component $lookup_token");
}
my $manager = $component->GetManager();
# Return a blob.
my $blob = { "gid" => $component->cert(),
"url" => $component->url(),
my $blob = { "gid" => $component->cert(),
"url" => $component->url(),
"manager_gid" => $manager->cert(),
};
return GeniResponse->Create(GENIRESPONSE_SUCCESS, $blob);
......
......@@ -1011,6 +1011,10 @@ sub GetTicketAuxAux($$$$$$$$)
next;
}
if (!exists($ifacemap{$node_nickname})) {
# Might be the other side. Skip for now; might bite later.
next
if (!exists($namemap{$node_nickname}));
$response =
GeniResponse->Create(GENIRESPONSE_ERROR, undef,
"$lanname: No such virtual_node_id: ".
......
#!/usr/bin/perl -w
#
# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
# All rights reserved.
#
use strict;
......@@ -70,15 +70,6 @@ if ($type =~ /^([\w]*)$/) {
else {
fatal("Illegal chars in type: $type");
}
if ($token =~ /^([-\d]*)$/) {
$uuid = $1;
}
elsif ($token =~ /^([-\w\.]*)$/) {
$hrn = $1;
}
else {
fatal("Illegal chars in argument: $token");
}
#
# Load the SA cert to act as caller context.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment