--- loncom/auth/lonacc.pm	2022/06/20 15:07:21	1.204
+++ loncom/auth/lonacc.pm	2022/06/30 21:04:13	1.205
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.204 2022/06/20 15:07:21 raeburn Exp $
+# $Id: lonacc.pm,v 1.205 2022/06/30 21:04:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -333,7 +333,7 @@ sub sso_login {
         }
     }
 
-    my ($linkprot,$linkprotuser,$linkkey,$deeplinkurl);
+    my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl);
 
 #
 # If Shibboleth auth is in use, and a dual SSO and non-SSO login page
@@ -372,6 +372,7 @@ sub sso_login {
         if ($info{'linkprot'}) {
             $linkprot = $info{'linkprot'};
             $linkprotuser = $info{'linkprotuser'};
+            $linkprotexit = $info{'linkprotexit'};
         } elsif ($info{'linkkey'} ne '') {
             $linkkey = $info{'linkkey'};
         }
@@ -397,6 +398,7 @@ sub sso_login {
             if ($form{'linkprot'}) {
                 $linkprot = $form{'linkprot'};
                 $linkprotuser = $form{'linkprotuser'};
+                $linkprotexit = $form{'linkprotexit'};
             } elsif ($form{'linkkey'} ne '') {
                 $linkkey = $form{'linkkey'};
             }
@@ -425,6 +427,7 @@ sub sso_login {
             if ($form{'linkprot'}) {
                 $linkprot = $form{'linkprot'};
                 $linkprotuser = $form{'linkprotuser'};
+                $linkprotexit = $form{'linkprotexit'};
             } elsif ($form{'linkkey'} ne '') {
                 $linkkey = $form{'linkkey'};
             }
@@ -432,8 +435,13 @@ sub sso_login {
     } elsif ($form{'ltoken'}) {
         my %link_info = &Apache::lonnet::tmpget($form{'ltoken'});
         $linkprot = $link_info{'linkprot'};
-        if (($linkprot) && ($link_info{'linkprotuser'} ne '')) {
-            $linkprotuser = $link_info{'linkprotuser'};    
+        if ($linkprot) {
+            if ($link_info{'linkprotuser'} ne '') {
+                $linkprotuser = $link_info{'linkprotuser'};
+            }
+            if ($link_info{'linkprotexit'} ne '') {
+                $linkprotexit = $link_info{'linkprotexit'};
+            }
         }
         my $delete = &Apache::lonnet::tmpdel($form{'ltoken'});
         delete($form{'ltoken'});
@@ -455,6 +463,7 @@ sub sso_login {
                            origurl => $deeplinkurl,
                            linkprot => $linkprot,
                            linkprotuser => $linkprotuser,
+                           linkprotexit => $linkprotexit,
                        );
             my $token = &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'link');
             unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) ||
@@ -521,6 +530,9 @@ sub sso_login {
                     if ($linkprotuser ne '') {
                         $env{'request.linkprotuser'} = $linkprotuser;
                     }
+                    if ($linkprotexit ne '') {
+                        $env{'request.linkprotexit'} = $linkprotexit;
+                    }
                 } elsif ($linkkey ne '') {
                     $env{'request.linkkey'} = $linkkey;
                 }
@@ -566,6 +578,12 @@ sub sso_login {
             if ($info{'deeplink.login'}) {
                 if ($linkprot) {
                     $info{'linkprot'} = $linkprot;
+                    if ($linkprotuser ne '') {
+                        $info{'linkprotuser'} = $linkprotuser;
+                    }
+                    if ($linkprotexit ne '') {
+                        $info{'linkprotexit'} = $linkprotexit;
+                    }
                 } elsif ($linkkey ne '') {
                     $info{'linkkey'} = $linkkey;
                 }
@@ -785,6 +803,7 @@ sub handler {
                                 origurl => $requrl,
                                 linkprot => $info{'linkprot'},
                                 linkprotuser => $info{'linkprotuser'},
+                                linkprotexit => $info{'linkprotexit'},
                             );
                         } elsif ($info{'ltoken'} ne '') {
                             my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'});
@@ -794,6 +813,7 @@ sub handler {
                                     origurl => $requrl,
                                     linkprot => $ltoken_info{'linkprot'},
                                     linkprotuser => $ltoken_info{'linkprotuser'},
+                                    linkprotexit => $ltoken_info{'linkprotexit'},
                                 );
                             }
                         }