[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm

[www]

www		Mon Mar 24 09:18:58 2003 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  More "intuitive" ordering of uname and udom
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.347 loncom/lonnet/perl/lonnet.pm:1.348
--- loncom/lonnet/perl/lonnet.pm:1.347	Sun Mar 23 04:00:51 2003
+++ loncom/lonnet/perl/lonnet.pm	Mon Mar 24 09:18:58 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.347 2003/03/23 09:00:51 albertel Exp $
+# $Id: lonnet.pm,v 1.348 2003/03/24 14:18:58 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -600,12 +600,12 @@
     $uname=$ENV{'user.domain'} unless (defined($uname));
     my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
     if (($existing{$ckey}=~/^\d+$/) || # has time - new key
-        ($existing{$ckey} eq $udom.':'.$uname)) { # this should not happen,
+        ($existing{$ckey} eq $uname.':'.$udom)) { # this should not happen,
                                                   # unless something went wrong
                                                   # the first time around
 # ready to assign
     } elsif (!$existing{$ckey}) {
-        if (&put('accesskey',{$ckey=>$udom.':'.$uname},$cdom,$cnum) eq 'ok') {
+        if (&put('accesskey',{$ckey=>$uname.':'.$udom},$cdom,$cnum) eq 'ok') {
 # key now belongs to user
 	    my $envkey='key.'.$cdom.'_'.$cnum;
             if (&put('environment',{$envkey => $ckey}) eq 'ok') {
@@ -671,7 +671,7 @@
     $udom=$ENV{'user.name'} unless (defined($udom));
     $uname=$ENV{'user.domain'} unless (defined($uname));
     my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
-    return ($existing{$ckey} eq $udom.':'.$uname);
+    return ($existing{$ckey} eq $uname.':'.$udom);
 }
 
 # ------------------------------------- Find the section of student in a course