Commit baaf91cd authored by Leigh Stoller's avatar Leigh Stoller

Minor cleanup.

parent f106b25e
......@@ -27,7 +27,6 @@ my $TBOPS = "@TBOPSEMAIL@";
my $TBLOGS = "@TBLOGSEMAIL@";
my $PGENIDOMAIN = "@PROTOGENI_DOMAIN@";
my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $TBBASE = "@TBBASE@";
my $WWWBUNDLE = "$TB/www/genica.bundle";
my $BUNDLE = "$TB/etc/genica.bundle";
my $APACHE_START = "@APACHE_START_COMMAND@";
......
#!/usr/bin/perl -w
#
# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2009 University of Utah and the Flux Group.
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
# All rights reserved.
#
use strict;
......@@ -28,7 +28,6 @@ my $TBOPS = "@TBOPSEMAIL@";
my $TBLOGS = "@TBLOGSEMAIL@";
my $PGENIDOMAIN = "@PROTOGENI_DOMAIN@";
my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $TBBASE = "@TBBASE@";
my $SSLDIR = "$TB/lib/ssl";
my $CACONFIG = "$SSLDIR/ca.cnf";
my $EMULAB_CERT = "$TB/etc/emulab.pem";
......
......@@ -27,7 +27,6 @@ my $TBOPS = "@TBOPSEMAIL@";
my $TBLOGS = "@TBLOGSEMAIL@";
my $PGENIDOMAIN = "@PROTOGENI_DOMAIN@";
my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $TBBASE = "@TBBASE@";
my $WWWBUNDLE = "$TB/www/genicrl.bundle";
my $BUNDLE = "$TB/etc/genicrl.bundle";
my $POSTCRL = "$TB/sbin/protogeni/postcrl";
......
#!/usr/bin/perl -w
#
# GENIPUBLIC-COPYRIGHT
# Copyright (c) 2008-2010 University of Utah and the Flux Group.
# Copyright (c) 2008-2011 University of Utah and the Flux Group.
# All rights reserved.
#
use strict;
......@@ -27,7 +27,6 @@ my $TBOPS = "@TBOPSEMAIL@";
my $TBLOGS = "@TBLOGSEMAIL@";
my $PGENIDOMAIN = "@PROTOGENI_DOMAIN@";
my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $TBBASE = "@TBBASE@";
my $SACERT = "$TB/etc/genisa.pem";
my $CRL = "$TB/ssl/crl.pem";
my $GENCRL = "$TB/sbin/protogeni/gencrl";
......
......@@ -69,9 +69,9 @@ if (!defined($certificate)) {
}
Genixmlrpc->SetContext(Genixmlrpc->Context($certificate));
my $component = GeniComponent->Lookup($urn);
my $component = GeniComponent->CreateFromRegistry($urn);
if (!defined($component)) {
$component = GeniComponent->CreateFromRegistry($urn);
fatal("Could not create local component object");
}
my $blob = $component->Resolve();
if (!defined($blob)) {
......
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