Commit 516f341c authored by Wim Van de Meerssche's avatar Wim Van de Meerssche Committed by Leigh B Stoller
Browse files

removed code caused by bad git merge

parent 2b9590e5
...@@ -891,7 +891,6 @@ sub GetKeys($) ...@@ -891,7 +891,6 @@ sub GetKeys($)
my $creds = $argref->{'credentials'}; my $creds = $argref->{'credentials'};
# Hidden option. Remove later. # Hidden option. Remove later.
my $version = $argref->{'version'} || 1; my $version = $argref->{'version'} || 1;
my $ignore_subauthority;
if (! (defined($cred) || defined($creds))) { if (! (defined($cred) || defined($creds))) {
return GeniResponse->MalformedArgsResponse(); return GeniResponse->MalformedArgsResponse();
...@@ -904,27 +903,10 @@ sub GetKeys($) ...@@ -904,27 +903,10 @@ sub GetKeys($)
} }
my ($credential, $speaksfor); my ($credential, $speaksfor);
if (defined($cred)) { if (defined($cred)) {
if (defined ($ignore_subauthority) && $ignore_subauthority) { $credential = GeniCredential::CheckCredential($cred, $authority);
#NOTE:
# the check for the credential $authority was removed
# this is needed to allow the geni-sa to work without sub authorities
# but this ALSO allows sharing with non-project members
# That is actually a nice feature.
# The previous restriction to sharing only within a
# project can be reimplemented by checking project membership of the target user manually here.
$credential = GeniCredential::CheckCredential($cred);
} else {
$credential = GeniCredential::CheckCredential($cred, $authority);
}
} }
else { else {
if (defined ($ignore_subauthority) && $ignore_subauthority) { ($credential,$speaksfor) = GeniStd::CheckCredentials($creds, $authority);
#Same note as above about check for matching $authority
($credential,$speaksfor) = GeniStd::CheckCredentials($creds);
} else {
($credential,$speaksfor) = GeniStd::CheckCredentials($creds, $authority);
}
} }
return $credential return $credential
if (GeniResponse::IsResponse($credential)); if (GeniResponse::IsResponse($credential));
......
Supports Markdown
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