--- loncom/auth/lonlogout.pm	2015/03/12 00:50:10	1.49
+++ loncom/auth/lonlogout.pm	2017/02/25 20:00:36	1.50
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.49 2015/03/12 00:50:10 raeburn Exp $
+# $Id: lonlogout.pm,v 1.50 2017/02/25 20:00:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,6 +70,13 @@ sub handler {
     my $lonidsdir=$r->dir_config('lonIDsDir');
     &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
     unlink("$lonidsdir/$handle.id");
+    if ($env{'user.linkedenv'} ne '') {
+        my $lonhost = $r->dir_config('lonHostID');
+        if ((-l $env{'user.linkedenv'}) && 
+            (readlink($env{'user.linkedenv'}) eq "$lonidsdir/$handle.id")) {
+            unlink($env{'user.linkedenv'});
+        }
+    }
     if (!$Apache::lonlocal::lh) {
         &Apache::lonlocal::get_language_handle($r);
     }
@@ -83,11 +90,20 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
 
     #expire the cookie
-    my $c = new CGI::Cookie(-name    => 'lonID',
+    my $name = 'lonID';
+    if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
+        $name = 'lonPubID';
+    }
+    my $c = new CGI::Cookie(-name    => $name,
 			    -value   => '',
 			    -expires => '-10y',);
-    $r->header_out('Set-cookie' => $c);
-
+    $r->headers_out->add('Set-cookie' => $c);
+    if (($name eq 'lonID') && ($env{'user.linkeenv'})) {
+        my $other = new CGI::Cookie(-name    => 'lonLinkID',
+                                    -value   => '',
+                                    -expires => '-10y',);
+        $r->headers_out->add('Set-cookie' => $other);
+    }
     $r->send_http_header;
     return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info