--- loncom/auth/lonroles.pm	2018/07/01 00:03:42	1.339
+++ loncom/auth/lonroles.pm	2018/12/27 20:10:44	1.342
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.339 2018/07/01 00:03:42 raeburn Exp $
+# $Id: lonroles.pm,v 1.342 2018/12/27 20:10:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -721,9 +721,11 @@ ENDENTERKEY
                                             if (($dest =~ m{^\Q/public/$cdom/$cnum/syllabus\E.*(\?|\&)usehttp=1}) ||
                                                 ($dest =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {
                                                 if ($ENV{'SERVER_PORT'} == 443) {
-                                                    my $hostname = $r->hostname();
-                                                    if ($hostname ne '') {
-                                                        $dest = 'http://'.$hostname.$dest;
+                                                    unless (&Apache::lonnet::uses_sts()) {
+                                                        my $hostname = $r->hostname();
+                                                        if ($hostname ne '') {
+                                                            $dest = 'http://'.$hostname.$dest;
+                                                        }
                                                     }
                                                 }
                                             }
@@ -1366,8 +1368,8 @@ sub gather_roles {
                     if (!$allowed) {
                         $button=0;
                         unless ($trustchecked{$tdom}) {
-                            if ((&Apache::lonnet::will_trust('othcoau',$tdom,$env{'user.domain'})) &&
-                                (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$tdom))) {
+                            if ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$tdom)) &&
+                                (&Apache::lonnet::will_trust('coaurem',$tdom,$env{'user.domain'}))) {
                                 $willtrust{$tdom} = 1;
                                 $trustchecked{$tdom} = 1;
                             }