--- loncom/interface/loncreateuser.pm	2002/08/07 18:04:35	1.37
+++ loncom/interface/loncreateuser.pm	2002/08/22 21:22:30	1.39.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.37 2002/08/07 18:04:35 matthew Exp $
+# $Id: loncreateuser.pm,v 1.39.2.1 2002/08/22 21:22:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,7 @@
 # 11/12,11/13,11/15 Scott Harrison
 # 02/11/02 Matthew Hall
 #
-# $Id: loncreateuser.pm,v 1.37 2002/08/07 18:04:35 matthew Exp $
+# $Id: loncreateuser.pm,v 1.39.2.1 2002/08/22 21:22:30 albertel Exp $
 ###
 
 package Apache::loncreateuser;
@@ -234,8 +234,6 @@ ENDCHANGEUSER
 <tr>
 END
         foreach ('firstname','middlename','lastname','generation') {
-            my $result = &Apache::lonnet::allowed('mau',$ccdomain);
-            &Apache::lonnet::logthis("allowed: mau, $ccdomain = $result");
            if (&Apache::lonnet::allowed('mau',$ccdomain)) {
               $r->print(<<"END");            
 <td><input type="text" name="c$_" value="$userenv{$_}" size="15"/></td>
@@ -330,8 +328,8 @@ END
 	   $r->print('</table>');
         }  # End of unless
 	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
-	if ($currentauth=~/^krb4:/) {
-	    $currentauth=~/^krb4:(.*)/;
+	if ($currentauth=~/^krb(4|5):/) {
+	    $currentauth=~/^krb(4|5):(.*)/;
 	    my $krbdefdom2=$1;
             my %param = ( formname => 'document.cu',
                           kerb_def_dom => $krbdefdom 
@@ -339,7 +337,7 @@ END
             $loginscript  = &Apache::loncommon::authform_header(%param);
 	}
 	# Check for a bad authentication type
-        unless ($currentauth=~/^krb4:/ or
+        unless ($currentauth=~/^krb(4|5):/ or
 		$currentauth=~/^unix:/ or
 		$currentauth=~/^internal:/ or
 		$currentauth=~/^localauth:/
@@ -377,7 +375,7 @@ ENDBADAUTH
         } else { # Authentication type is valid
 	    my $authformcurrent='';
 	    my $authform_other='';
-	    if ($currentauth=~/^krb4:/) {
+	    if ($currentauth=~/^krb(4|5):/) {
 		$authformcurrent=$authformkrb;
 		$authform_other="<p>$authformint</p>\n".
                     "<p>$authformfsys</p><p>$authformloc</p>";
@@ -537,7 +535,8 @@ ENDTHREEHEAD
     my $amode='';
     my $genpwd='';
     if ($ENV{'form.login'} eq 'krb') {
-	$amode='krb4';
+	$amode='krb';
+	$amode.=$ENV{'form.krbver'};
 	$genpwd=$ENV{'form.krbarg'};
     } elsif ($ENV{'form.login'} eq 'int') {
 	$amode='internal';
@@ -575,7 +574,7 @@ ENDNEWUSERHEAD
         if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;
         } else {
-            my %home_servers = &Apache::loncommon::get_home_servers
+            my %home_servers = &Apache::loncommon::get_library_servers
                 ($ENV{'form.ccdomain'});  
             if (! exists($home_servers{$desiredhost})) {
                 $r->print($error.'Invalid home server specified');