--- loncom/auth/lonlogin.pm	2022/06/26 04:03:47	1.200
+++ loncom/auth/lonlogin.pm	2022/06/30 21:04:13	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.200 2022/06/26 04:03:47 raeburn Exp $
+# $Id: lonlogin.pm,v 1.201 2022/06/30 21:04:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,8 +68,10 @@ sub handler {
             $env{'form.ltoken'} = $info{'ltoken'};
         } elsif ($info{'linkprot'}) {
             $env{'form.linkprot'} = $info{'linkprot'};
-            if ($info{'linkprotuser'} ne '') {
-                $env{'form.linkprotuser'} = $info{'linkprotuser'};
+            foreach my $item ('linkprotuser','linkprotexit') {
+                if ($info{$item} ne '') {
+                    $env{'form.'.$item} = $info{$item};
+                }
             }
         } elsif ($info{'linkkey'} ne '') {
             $env{'form.linkkey'} = $info{'linkkey'};
@@ -184,8 +186,10 @@ sub handler {
                     $link_info{'ltoken'} = $env{'form.ltoken'};
                 } elsif ($env{'form.linkprot'}) {
                     $link_info{'linkprot'} = $env{'form.linkprot'};
-                    if ($env{'form.linkprotuser'} ne '') {
-                        $link_info{'linkprotuser'} = $env{'form.linkprotuser'};
+                    foreach my $item ('linkprotuser','linkprotexit') {
+                        if ($env{'form.'.$item} ne '') {
+                            $link_info{$item} = $env{'form.'.$item};
+                        }
                     }
                 } elsif ($env{'form.linkkey'} ne '') {
                     $link_info{'linkkey'} = $env{'form.linkkey'};
@@ -255,16 +259,20 @@ sub handler {
             $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
         }
         if (($env{'form.ltoken'}) || ($env{'form.linkprot'})) {
-            my ($linkprot,$linkprotuser);
+            my ($linkprot,$linkprotuser,$linkprotexit);
             if ($env{'form.ltoken'}) {
                 my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
                 $linkprot = $info{'linkprot'};
                 if ($info{'linkprotuser'} ne '') {
                     $linkprotuser = $info{'linkprotuser'};
-                } 
+                }
+                if ($info{'linkprotexit'} ne '') {
+                    $linkprotexit = $info{'linkprotexit'};
+                }
             } else {
                 $linkprot = $env{'form.linkprot'};
                 $linkprotuser = $env{'form.linkprotuser'};
+                $linkprotexit = $env{'form.linkprotexit'};
             }
             if ($linkprot) {
                 my ($linkprotector,$deeplink) = split(/:/,$linkprot,2);
@@ -275,6 +283,7 @@ sub handler {
                                           origurl => $deeplink,
                                           linkprot => $linkprot,
                                           linkprotuser => $linkprotuser,
+                                          linkprotexit => $linkprotexit,
                                        );    
                     if ($env{'form.ltoken'}) {
                         my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
@@ -455,7 +464,7 @@ sub handler {
 
 # -------------------------------------------------------- Store away log token
     my ($tokenextras,$tokentype,$linkprot_for_login);
-    my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprot','linkkey');
+    my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprotexit','linkprot','linkkey');
     foreach my $name (@names) {
         if ($env{'form.'.$name} ne '') {
             if ($name eq 'ltoken') {
@@ -463,8 +472,10 @@ sub handler {
                 if ($info{'linkprot'}) {
                     $linkprot_for_login = $info{'linkprot'};
                     $tokenextras .= '&linkprot='.&escape($info{'linkprot'});
-                    if ($info{'linkprotuser'}) {
-                        $tokenextras .= '&linkprotuser='.&escape($info{'linkprotuser'});
+                    foreach my $item ('linkprotuser','linkprotexit') {
+                        if ($info{$item}) {
+                            $tokenextras .= '&'.$item.'='.&escape($info{$item});
+                        }
                     }
                     $tokentype = 'link';
                     last;
@@ -1166,8 +1177,10 @@ sub redirect_page {
                 $args->{'only_body'} = 1;
             } elsif ($env{'form.linkprot'}) {
                 $link_info{'linkprot'} = $env{'form.linkprot'};
-                if ($env{'form.linkprotuser'}) {
-                    $link_info{'linkprotuser'} = $env{'form.linkprotuser'};
+                foreach my $item ('linkprotuser','linkprotexit') {
+                    if ($env{'form.'.$item}) {
+                        $link_info{$item} = $env{'form.'.$item};
+                    }
                 }
                 $args->{'only_body'} = 1;
             } elsif ($env{'form.linkkey'} ne '') {