Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
c1cd811f
Commit
c1cd811f
authored
Mar 14, 2016
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change geni_trustroots options to just trustroots, since that
appears to be the convention for our locally grown options.
parent
f9759233
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
protogeni/lib/GeniAM.pm.in
protogeni/lib/GeniAM.pm.in
+2
-2
No files found.
protogeni/lib/GeniAM.pm.in
View file @
c1cd811f
...
...
@@ -232,7 +232,7 @@ sub GetVersion()
"geni_version"
=>
$
coder
->
string
(
"3"
)}
];
}
if
(
defined
($
options
)
&&
exists
($
options
->{
'
geni_
trustroots'
}))
{
if
(
defined
($
options
)
&&
exists
($
options
->{
'trustroots'
}))
{
my
@
roots
=
();
my
@
certs
=
GeniCertificate
::
SplitCertBundle
(
"$TB/etc/genica.bundle"
);
foreach
my
$
root
(@
certs
)
{
...
...
@@ -248,7 +248,7 @@ sub GetVersion()
"SubjAltNameURIs"
=>
[$
cert
->
urn
()],
});
}
$
blob
->{
"
geni_
trustroots"
}
=
\@
roots
;
$
blob
->{
"trustroots"
}
=
\@
roots
;
}
my
$
response
=
GeniResponse
->
Create
(
GENIRESPONSE_SUCCESS
,
$
blob
);
if
($
API_VERSION
>
1
)
{
...
...
Write
Preview
Markdown
is supported
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