--- loncom/auth/lonshibauth.pm	2021/10/07 18:52:03	1.8
+++ loncom/auth/lonshibauth.pm	2021/10/10 23:59:19	1.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Redirect Shibboleth authentication to designated URL (/adm/sso).
 #
-# $Id: lonshibauth.pm,v 1.8 2021/10/07 18:52:03 raeburn Exp $
+# $Id: lonshibauth.pm,v 1.10 2021/10/10 23:59:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,9 +90,8 @@ sub handler {
             $hostname = $alias;
         }
         my $dest = $protocol.'://'.$hostname.$target;
-        $r->subprocess_env;
-        if ($ENV{'QUERY_STRING'} ne '') {
-            $dest .= '?'.$ENV{'QUERY_STRING'};
+        if ($r->args ne '') {
+            $dest .= (($dest=~/\?/)?'&':'?').$r->args;
         }
         unless (($uri eq '/adm/roles') || ($uri eq '/adm/logout')) {
             if ($target eq '/adm/login') {
@@ -100,7 +99,7 @@ sub handler {
                     $dest.=(($dest=~/\?/)?'&':'?').'firsturl='.$uri;
                 }
             } else {
-                unless ($ENV{'QUERY_STRING'} =~ /origurl=/)) {
+                unless ($ENV{'QUERY_STRING'} =~ /origurl=/) {
                     $dest.=(($dest=~/\?/)?'&':'?').'origurl='.$uri;
                 }
             }