--- loncom/enrollment/Enrollment.pm	2004/01/14 21:03:31	1.10
+++ loncom/enrollment/Enrollment.pm	2004/03/18 16:46:28	1.12
@@ -1,5 +1,5 @@
 # Automated Enrollment manager
-# $Id: Enrollment.pm,v 1.10 2004/01/14 21:03:31 raeburn Exp $
+# $Id: Enrollment.pm,v 1.12 2004/03/18 16:46:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -242,9 +242,6 @@ sub update_LC {
                     if ( ($authparam eq '')  || (!defined($authparam)) )  {
                         $authparam = $autharg;
                     }
-                    if ($auth =~ m/^krb/) {
-                        $auth .= ":".$authparam;
-                    }
                     if ( ($end eq '') || (!defined($end)) )  {
                          $end = $enddate;
                     }
@@ -263,18 +260,19 @@ sub update_LC {
                         my $authchk = '';
                         unless ($authparam eq '') { $authchk = 'ok'; };
 # If no account exists and passwords should be generated
-                        if ($authtype eq "int") {
+                        if ($auth eq "internal") {
                             if ($authparam eq '') {
                                 ($authparam) = &create_password();
                                 if ($authparam eq '') {
-                                     $authchk = '';
+                                    $authchk = '';
                                 } else {
                                     $create_passwd = 1;
+                                    $authchk = 'ok';
                                 }        
                             }
-                        } elsif ($authtype eq "local") {
-                             ($authparam,$create_passwd,$authchk) = &localenroll::create_password($authparam);
-                        } elsif ($authtype =~ m/^krb/) {
+                        } elsif ($auth eq "localauth") {
+                            ($authparam,$create_passwd,$authchk) = &localenroll::create_password($authparam);
+                        } elsif ($auth =~ m/^krb/) {
                             if ($authparam eq '') {
                                 $$logmsg .= "No Kerberos domain was provided for the new user - $uname, so the new student was not enrolled in the course.".$linefeed;
                                 $authchk = 'invalid';
@@ -341,22 +339,22 @@ sub update_LC {
                         }                            
                         my $krbdefdom = '';
                         my $currentauth=&Apache::lonnet::queryauthenticate($uname,$dom);
-                        if ($currentauth=~/^krb(4|5):/) {
-                            $currentauth=~/^krb(4|5):(.*)/;
-                            $krbdefdom=$1;
-                        }
-                        if ($currentauth=~/^krb(4|5):/ || 
-                            $currentauth=~/^unix:/ ||
-                            $currentauth=~/^internal:/ ||
-                            $currentauth=~/^localauth:/) {
-                               
+                        if ($currentauth=~/^(krb[45]):(.*)/) {
+                            $currentauth = $1;
+                            $krbdefdom = $2;
+                        } elsif ($currentauth=~ /^(unix|internal|localauth):/) {
+                            $currentauth = $1;
                         } else {
                             $$logmsg .= "Invalid authentication method $currentauth for $uname.".$linefeed;  
                         }
 # Report if authentication methods are different.
-                        if ($currentauth ne $auth ) {
-                            $$logmsg .= "Authentication mismatch for $uname - $currentauth in system, $auth based on information in classlist or default for this course.".$linefeed;
-                        }
+                        if ($currentauth ne $auth) {
+                            $$logmsg .= "Authentication type mismatch for $uname - '$currentauth' in system, '$auth' based on information in classlist or default for this course.".$linefeed;
+                        } elsif ($auth =~ m/^krb/) {
+                            if ($krbdefdom ne $authparam) {
+                                $$logmsg .= "Kerberos domain mismatch for $uname - '$krbdefdom' in system, '$authparam' based on information in classlist or default for this course.".$linefeed;
+                            }
+
 # Check user data
                         if ($first  ne $userenv{'firstname'}  ||
                             $middle ne $userenv{'middlename'} ||
@@ -539,7 +537,7 @@ sub process_date {
 
 sub create_password {
     my $passwd = '';
-    my @letts = "a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z";
+    my @letts = ("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z");
     for (my $i=0; $i<8; $i++) {
         my $lettnum = int (rand 2);
         my $item = '';