Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
516f341c
Commit
516f341c
authored
Oct 21, 2015
by
Wim Van de Meerssche
Committed by
Leigh B Stoller
Oct 21, 2015
Browse files
removed code caused by bad git merge
parent
2b9590e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniSA.pm.in
View file @
516f341c
...
...
@@ -891,7 +891,6 @@ sub GetKeys($)
my
$
creds
=
$
argref
->{
'credentials'
};
#
Hidden
option
.
Remove
later
.
my
$
version
=
$
argref
->{
'version'
}
||
1
;
my
$
ignore_subauthority
;
if
(
! (defined($cred) || defined($creds))) {
return
GeniResponse
->
MalformedArgsResponse
();
...
...
@@ -904,27 +903,10 @@ sub GetKeys($)
}
my
($
credential
,
$
speaksfor
);
if
(
defined
($
cred
))
{
if
(
defined
($
ignore_subauthority
)
&&
$
ignore_subauthority
)
{
#
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
);
}
$
credential
=
GeniCredential
::
CheckCredential
($
cred
,
$
authority
);
}
else
{
if
(
defined
($
ignore_subauthority
)
&&
$
ignore_subauthority
)
{
#
Same
note
as
above
about
check
for
matching
$
authority
($
credential
,$
speaksfor
)
=
GeniStd
::
CheckCredentials
($
creds
);
}
else
{
($
credential
,$
speaksfor
)
=
GeniStd
::
CheckCredentials
($
creds
,
$
authority
);
}
($
credential
,$
speaksfor
)
=
GeniStd
::
CheckCredentials
($
creds
,
$
authority
);
}
return
$
credential
if
(
GeniResponse
::
IsResponse
($
credential
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment