--- loncom/lonnet/perl/lonnet.pm	2018/08/09 14:04:35	1.1381
+++ loncom/lonnet/perl/lonnet.pm	2018/09/20 14:17:11	1.1384
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1381 2018/08/09 14:04:35 raeburn Exp $
+# $Id: lonnet.pm,v 1.1384 2018/09/20 14:17:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -230,7 +230,12 @@ sub get_server_distarch {
 }
 
 sub get_servercerts_info {
-    my ($lonhost,$context) = @_;
+    my ($lonhost,$hostname,$context) = @_;
+    return if ($lonhost eq '');
+    if ($hostname eq '') {
+        $hostname = &hostname($lonhost);
+    }
+    return if ($hostname eq '');
     my ($rep,$uselocal);
     if (grep { $_ eq $lonhost } &current_machine_ids()) {
         $uselocal = 1;
@@ -250,16 +255,11 @@ sub get_servercerts_info {
         }
     }
     if ($uselocal) {
-        $rep = LONCAPA::Lond::server_certs(\%perlvar);
+        $rep = LONCAPA::Lond::server_certs(\%perlvar,$lonhost,$hostname);
     } else {
         $rep=&reply('servercerts',$lonhost);
     }
     my ($result,%returnhash);
-    if (defined($lonhost)) {
-        if (!defined(&hostname($lonhost))) {
-            return;
-        }
-    }
     if (($rep=~/^(refused|rejected|error)/) || ($rep eq 'con_lost') ||
         ($rep eq 'unknown_cmd')) {
         $result = $rep;
@@ -3197,7 +3197,8 @@ sub ssi {
 
     $request->header(Cookie => $ENV{'HTTP_COOKIE'});
     my $lonhost = $perlvar{'lonHostID'};
-    my $response= &LONCAPA::LWPReq::makerequest($lonhost,$request,'',\%perlvar);
+    my $response= &LONCAPA::LWPReq::makerequest($lonhost,$request,'',\%perlvar,
+                                                '','','',1);
 
     if (wantarray) {
 	return ($response->content, $response);
@@ -10045,7 +10046,7 @@ sub is_course {
     my $uhome=&homeserver($cnum,$cdom);
     my $iscourse;
     if (grep { $_ eq $uhome } current_machine_ids()) {
-        $iscourse = &Lond::is_course($cdom,$cnum);
+        $iscourse = &LONCAPA::Lond::is_course($cdom,$cnum);
     } else {
         my $hashid = $cdom.':'.$cnum;
         ($iscourse,my $cached) = &is_cached_new('iscourse',$hashid);