--- loncom/interface/loncommon.pm	2018/07/04 13:44:16	1.1319
+++ loncom/interface/loncommon.pm	2018/07/04 16:58:22	1.1320
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1319 2018/07/04 13:44:16 raeburn Exp $
+# $Id: loncommon.pm,v 1.1320 2018/07/04 16:58:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -16444,18 +16444,18 @@ sub init_user_environment {
 	    opendir(DIR,$lonids);
 	    while ($filename=readdir(DIR)) {
 		if ($filename=~/^$username\_\d+\_$domain\_$authhost\.id$/) {
-                    if ($ENV{'SERVER_PORT'} == 443) {
+                    if (tie(my %oldenv,'GDBM_File',"$lonids/$filename",
+                            &GDBM_READER(),0640)) {
                         my $linkedfile;
-                        if (tie(my %oldenv,'GDBM_File',"$lonids/$cookie.id",
-                                &GDBM_READER(),0640)) {
-                            if (exists($oldenv{'user.linkedenv'})) {
-                                $linkedfile = $oldenv{'user.linkedenv'};
-                            }
-                            untie(%oldenv);
+                        if (exists($oldenv{'user.linkedenv'})) {
+                            $linkedfile = $oldenv{'user.linkedenv'};
                         }
-                        if (unlink($lonids.'/'.$filename)) {
-                            if ($linkedfile =~ /^[a-f0-9]+_linked\.id$/) {
-                                unlink($lonids.'/'.$linkedfile);
+                        untie(%oldenv);
+                        if (unlink("$lonids/$filename")) {
+                            if ($linkedfile =~ /^[a-f0-9]+_linked$/) {
+                                if (-l "$lonids/$linkedfile.id") {
+                                    unlink("$lonids/$linkedfile.id");
+                                }
                             }
                         }
                     } else {