--- loncom/lonnet/perl/lonnet.pm	2017/01/28 23:26:51	1.1336
+++ loncom/lonnet/perl/lonnet.pm	2017/02/25 20:00:41	1.1337
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1336 2017/01/28 23:26:51 raeburn Exp $
+# $Id: lonnet.pm,v 1.1337 2017/02/25 20:00:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -650,10 +650,23 @@ sub transfer_profile_to_env {
 sub check_for_valid_session {
     my ($r,$name,$userhashref) = @_;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
+    my ($linkname,$pubname);
     if ($name eq '') {
         $name = 'lonID';
+        $linkname = 'lonLinkID';
+        $pubname = 'lonPubID';
     }
     my $lonid=$cookies{$name};
+    if (!$lonid) {
+        if (($name eq 'lonID') && ($ENV{'SERVER_PORT'} != 443) && ($linkname)) {
+            $lonid=$cookies{$linkname};
+        }
+        if (!$lonid) {
+            if (($name eq 'lonID') && ($pubname)) {
+                $lonid=$cookies{$pubname};
+            }
+        }
+    }
     return undef if (!$lonid);
 
     my $handle=&LONCAPA::clean_handle($lonid->value);