--- loncom/interface/loncreateuser.pm 2001/11/16 06:23:11 1.20
+++ loncom/interface/loncreateuser.pm 2001/11/16 07:00:53 1.21
@@ -22,7 +22,7 @@
# 05/10,10/16 Gerd Kortemeyer
# 11/12,11/13,11/15 Scott Harrison
#
-# $Id: loncreateuser.pm,v 1.20 2001/11/16 06:23:11 harris41 Exp $
+# $Id: loncreateuser.pm,v 1.21 2001/11/16 07:00:53 harris41 Exp $
###
package Apache::loncreateuser;
@@ -346,21 +346,19 @@ ENDNUSER
$loginscript=~s/vf\.krbdom\.value='.*?';/vf.krbdom.value='$krbdefdom2';/;
}
# minor script hack here
- $loginscript=~s/login\[3\]/login\[4\]/;
- $loginscript=~s/login\[2\]/login\[3\]/;
- $loginscript=~s/login\[1\]/login\[2\]/;
- $loginscript=~s/login\[0\]/login\[1\]/;
+# $loginscript=~s/login\[3\]/login\[4\]/; # loc
+# $loginscript=~s/login\[2\]/login\[3\]/; # fsys
+# $loginscript=~s/login\[1\]/login\[2\]/; # int
+# $loginscript=~s/login\[0\]/login\[1\]/; # krb4
- $r->print(<
-$loginscript
-END
unless ($currentauth=~/^krb4:/ or
$currentauth=~/^unix:/ or
$currentauth=~/^internal:/ or
$currentauth=~/^localauth:/
) {
$r->print(<
+$loginscript
ERROR:
This user has an unrecognized authentication scheme ($currentauth).
Please specify login data below.
@@ -378,18 +376,39 @@ END
if ($currentauth=~/^krb4:/) {
$authformcurrent=$authformkrb;
$authformother=$authformint.$authformfsys.$authformloc;
+ # embarrassing script hack here
+ $loginscript=~s/login\[3\]/login\[4\]/; # loc
+ $loginscript=~s/login\[2\]/login\[3\]/; # fsys
+ $loginscript=~s/login\[1\]/login\[2\]/; # int
+ $loginscript=~s/login\[0\]/login\[1\]/; # krb4
}
elsif ($currentauth=~/^internal:/) {
$authformcurrent=$authformint;
$authformother=$authformkrb.$authformfsys.$authformloc;
+ # embarrassing script hack here
+ $loginscript=~s/login\[3\]/login\[4\]/; # loc
+ $loginscript=~s/login\[2\]/login\[3\]/; # fsys
+ $loginscript=~s/login\[1\]/login\[1\]/; # int
+ $loginscript=~s/login\[0\]/login\[2\]/; # krb4
}
elsif ($currentauth=~/^unix:/) {
$authformcurrent=$authformfsys;
$authformother=$authformkrb.$authformint.$authformloc;
+ # embarrassing script hack here
+ $loginscript=~s/login\[3\]/login\[4\]/; # loc
+ $loginscript=~s/login\[1\]/login\[3\]/; # int
+ $loginscript=~s/login\[2\]/login\[1\]/; # fsys
+ $loginscript=~s/login\[0\]/login\[2\]/; # krb4
}
elsif ($currentauth=~/^localauth:/) {
$authformcurrent=$authformloc;
$authformother=$authformkrb.$authformint.$authformfsys;
+ # embarrassing script hack here
+ $loginscript=~s/login\[3\]/login\[loc\]/; # loc
+ $loginscript=~s/login\[2\]/login\[4\]/; # fsys
+ $loginscript=~s/login\[1\]/login\[3\]/; # int
+ $loginscript=~s/login\[0\]/login\[2\]/; # krb4
+ $loginscript=~s/login\[loc\]/login\[1\]/; # loc
}
$authformcurrent=<
@@ -402,6 +421,8 @@ END
END
$r->print(<
+$loginscript
Change Current Login Data
$generalrule
$authformnop
@@ -583,7 +604,7 @@ ENDTHREEHEAD
$r->print('Modifying authentication: '.
&Apache::lonnet::modifyuserauth(
$ENV{'form.cdomain'},$ENV{'form.cuname'},
- $amode,$genpwd);
+ $amode,$genpwd));
$r->print('
Home server: '.&Apache::lonnet::homeserver
($ENV{'form.cuname'},$ENV{'form.cdomain'}));