--- loncom/auth/lonlogout.pm	2018/05/08 15:37:41	1.54
+++ loncom/auth/lonlogout.pm	2018/07/04 16:58:19	1.55
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.54 2018/05/08 15:37:41 raeburn Exp $
+# $Id: lonlogout.pm,v 1.55 2018/07/04 16:58:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,12 +71,11 @@ sub handler {
     my @profile;
     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 (unlink("$lonidsdir/$handle.id")) {
+        if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) &&
+            (-l "$lonidsdir/$env{'user.linkedenv'}.id") &&
+            (readlink("$lonidsdir/$env{'user.linkedenv'}.id") eq "$lonidsdir/$handle.id")) {
+            unlink("$lonidsdir/$env{'user.linkedenv'}.id");
         }
     }
     if (!$Apache::lonlocal::lh) {
@@ -91,20 +90,14 @@ sub handler {
 
     &Apache::loncommon::content_type($r,'text/html');
 
-    #expire the cookie
-    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->headers_out->add('Set-cookie' => $c);
-    if (($name eq 'lonID') && ($env{'user.linkedenv'})) {
-        my $other = new CGI::Cookie(-name    => 'lonLinkID',
-                                    -value   => '',
-                                    -expires => '-10y',);
-        $r->headers_out->add('Set-cookie' => $other);
+    #expire the cookies
+    my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
+    foreach my $name (keys(%cookies)) {
+        next unless ($name =~ /^lon(|S|Link|Pub)ID$/);
+        my $c = new CGI::Cookie(-name    => $name,
+                                -value   => '',
+                                -expires => '-10y',);
+        $r->headers_out->add('Set-cookie' => $c);
     }
     $r->send_http_header;
     return OK if $r->header_only;