summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-08 15:49:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-08 15:49:37 +0000
commit833ff65329c6812f283e112f3ef5c60232b50172 (patch)
treed7eda24de53827fe4159c21b40699373746ad372
parenteed856e1569dbc37ff2d80dc31cbc7d1762d0fd2 (diff)
downloaddrakx-833ff65329c6812f283e112f3ef5c60232b50172.tar
drakx-833ff65329c6812f283e112f3ef5c60232b50172.tar.gz
drakx-833ff65329c6812f283e112f3ef5c60232b50172.tar.bz2
drakx-833ff65329c6812f283e112f3ef5c60232b50172.tar.xz
drakx-833ff65329c6812f283e112f3ef5c60232b50172.zip
- write_passwd_user: ensure {pw} is set (at least '')
- cleanup dead code
-rw-r--r--perl-install/any.pm12
1 files changed, 1 insertions, 11 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 7ae914036..7ef9effba 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -74,16 +74,6 @@ sub enableShadow {
run_program::rooted($prefix, "pwconv") or log::l("pwconv failed");
run_program::rooted($prefix, "grpconv") or log::l("grpconv failed");
}
-sub enableMD5Shadow { #- NO MORE USED
- my ($prefix, $shadow, $md5) = @_;
- substInFile {
- if (/^password.*pam_pwdb.so/) {
- s/\s*shadow//; s/\s*md5//;
- s/$/ shadow/ if $shadow;
- s/$/ md5/ if $md5;
- }
- } grep { -r $_ } map { "$prefix/etc/pam.d/$_" } qw(login rlogin passwd);
-}
sub grub_installed {
my ($in) = @_;
@@ -868,7 +858,7 @@ when your installation is complete and you restart your system.")),
sub write_passwd_user {
my ($prefix, $u, $isMD5) = @_;
- $u->{pw} = &crypt($u->{password}, $isMD5) if $u->{password};
+ $u->{pw} = $u->{password} ? &crypt($u->{password}, $isMD5) : $u->{pw} || '';
$u->{shell} ||= '/bin/bash';
substInFile {