--- loncom/auth/switchserver.pm	2018/12/02 13:56:10	1.45
+++ loncom/auth/switchserver.pm	2019/01/27 16:02:43	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.45 2018/12/02 13:56:10 raeburn Exp $
+# $Id: switchserver.pm,v 1.48 2019/01/27 16:02:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,8 +149,8 @@ sub handler {
             } elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)$}) {
                 my ($audom,$auname) = ($1,$2);
                 if (&Apache::lonnet::homeserver($auname,$audom) eq $env{'form.otherserver'}) {
-                    if ((&Apache::lonnet::will_trust('othcoau',$audom,$env{'user.domain'})) &&
-                        (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$audom))) {                             
+                    if ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$audom)) &&
+                        (&Apache::lonnet::will_trust('coaurem',$audom,$env{'user.domain'}))) {                             
                         $skip_canhost_check = 1;
                     }
                 }
@@ -280,6 +280,15 @@ sub handler {
     if ($env{'request.sso.reloginserver'}) {
         $info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};
     }
+    if ($env{'request.linkprot'}) {
+        $info{'linkprot'} = $env{'request.linkprot'};
+    }
+    if ($env{'request.deeplink.login'}) {
+        $info{'deeplink.login'} = $env{'request.deeplink.login'};
+        if ($env{'request.linkkey'}) {
+            $info{'linkkey'} = $env{'request.linkkey'};
+        }
+    }
     if ($env{'request.lti.login'}) {
         $info{'lti.login'} = $env{'request.lti.login'};
     }