version 1.40, 2002/08/21 17:18:08
|
version 1.41, 2002/08/22 21:05:25
|
Line 329 END
|
Line 329 END
|
$r->print('</table>'); |
$r->print('</table>'); |
} # End of unless |
} # End of unless |
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); |
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); |
if ($currentauth=~/^krb4:/) { |
if ($currentauth=~/^krb(4|5):/) { |
$currentauth=~/^krb4:(.*)/; |
$currentauth=~/^krb(4|5):(.*)/; |
my $krbdefdom2=$1; |
my $krbdefdom2=$1; |
my %param = ( formname => 'document.cu', |
my %param = ( formname => 'document.cu', |
kerb_def_dom => $krbdefdom |
kerb_def_dom => $krbdefdom |
Line 338 END
|
Line 338 END
|
$loginscript = &Apache::loncommon::authform_header(%param); |
$loginscript = &Apache::loncommon::authform_header(%param); |
} |
} |
# Check for a bad authentication type |
# Check for a bad authentication type |
unless ($currentauth=~/^krb4:/ or |
unless ($currentauth=~/^krb(4|5):/ or |
$currentauth=~/^unix:/ or |
$currentauth=~/^unix:/ or |
$currentauth=~/^internal:/ or |
$currentauth=~/^internal:/ or |
$currentauth=~/^localauth:/ |
$currentauth=~/^localauth:/ |
Line 376 ENDBADAUTH
|
Line 376 ENDBADAUTH
|
} else { # Authentication type is valid |
} else { # Authentication type is valid |
my $authformcurrent=''; |
my $authformcurrent=''; |
my $authform_other=''; |
my $authform_other=''; |
if ($currentauth=~/^krb4:/) { |
if ($currentauth=~/^krb(4|5):/) { |
$authformcurrent=$authformkrb; |
$authformcurrent=$authformkrb; |
$authform_other="<p>$authformint</p>\n". |
$authform_other="<p>$authformint</p>\n". |
"<p>$authformfsys</p><p>$authformloc</p>"; |
"<p>$authformfsys</p><p>$authformloc</p>"; |
Line 541 ENDTHREEHEAD
|
Line 541 ENDTHREEHEAD
|
my $amode=''; |
my $amode=''; |
my $genpwd=''; |
my $genpwd=''; |
if ($ENV{'form.login'} eq 'krb') { |
if ($ENV{'form.login'} eq 'krb') { |
$amode='krb4'; |
$amode='krb'; |
|
$amode.=$ENV{'form.krbver'}; |
$genpwd=$ENV{'form.krbarg'}; |
$genpwd=$ENV{'form.krbarg'}; |
} elsif ($ENV{'form.login'} eq 'int') { |
} elsif ($ENV{'form.login'} eq 'int') { |
$amode='internal'; |
$amode='internal'; |