summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-08 15:48:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-08 15:48:20 +0000
commiteed856e1569dbc37ff2d80dc31cbc7d1762d0fd2 (patch)
treedfaec82af44fcbb21ba6013405ae0cf5c3e3126f
parent773a87f40ae5955a90f608c51985649be1179f26 (diff)
downloaddrakx-eed856e1569dbc37ff2d80dc31cbc7d1762d0fd2.tar
drakx-eed856e1569dbc37ff2d80dc31cbc7d1762d0fd2.tar.gz
drakx-eed856e1569dbc37ff2d80dc31cbc7d1762d0fd2.tar.bz2
drakx-eed856e1569dbc37ff2d80dc31cbc7d1762d0fd2.tar.xz
drakx-eed856e1569dbc37ff2d80dc31cbc7d1762d0fd2.zip
- fix detecting use of MD5 and shadow passwords
- cosmetic move of any::addUsers
-rwxr-xr-xperl-install/standalone/adduserdrake8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake
index c176f5936..98a2e3dd0 100755
--- a/perl-install/standalone/adduserdrake
+++ b/perl-install/standalone/adduserdrake
@@ -17,8 +17,8 @@ $::expert = /-expert/;
my @etc_pass_fields = qw(name pw uid gid realname home shell);
my @shells = grep { -x $_ } map { "/bin/$_" } qw(bash tcsh zsh ash ksh);
-my $isMD5 = cat_("/etc/pam.d/passwd") =~ /md5/;
-my $isShadow = cat_("/etc/pam.d/passwd") =~ /shadow/;
+my $isMD5 = cat_("/etc/pam.d/system-auth") =~ /md5/;
+my $isShadow = cat_("/etc/pam.d/system-auth") =~ /shadow/;
my $users = [];
@@ -32,11 +32,11 @@ if (my @l = grep { ! /^-/ } @ARGV) {
}
system("adduser", $_->{name}) foreach @$users;
-any::addUsers('', $users);
-
any::write_passwd_user('', $_, $isMD5) foreach @$users;
system("pwconv") if $isShadow;
+any::addUsers('', $users);
+
#$in->do_pkgs->install("autologin") if $o->{autologin};
#any::set_autologin('', $o->{autologin}, $o->{desktop});