summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-08-22 15:40:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-08-22 15:40:00 +0000
commit231b6bd7b02a81a7383a8c407e7c90ba927692e2 (patch)
tree03eb0d63b2ab9c757cd4f0f131b566b330f7c369 /perl-install/any.pm
parentd1066453d3c10568473dbcb9d3aeb31ae9a66afd (diff)
downloaddrakx-backup-do-not-use-231b6bd7b02a81a7383a8c407e7c90ba927692e2.tar
drakx-backup-do-not-use-231b6bd7b02a81a7383a8c407e7c90ba927692e2.tar.gz
drakx-backup-do-not-use-231b6bd7b02a81a7383a8c407e7c90ba927692e2.tar.bz2
drakx-backup-do-not-use-231b6bd7b02a81a7383a8c407e7c90ba927692e2.tar.xz
drakx-backup-do-not-use-231b6bd7b02a81a7383a8c407e7c90ba927692e2.zip
change prototype of any::create_user(), authentication::user_crypted_passwd(),
authentication::write_passwd_user(): pass $authentication instead of $isMD5 (for next commits)
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index f51f98cbf..d74f3f99b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -48,7 +48,7 @@ sub alloc_user_faces {
}
sub create_user {
- my ($u, $isMD5) = @_;
+ my ($u, $authentication) = @_;
my @existing = stat("$::prefix/home/$u->{name}");
@@ -72,7 +72,7 @@ sub create_user {
my $symlink_home_from = $u->{rename_from} && (getpwnam($u->{rename_from}))[7];
run_program::raw({ root => $::prefix, sensitive_arguments => 1 },
($u->{rename_from} ? 'usermod' : 'adduser'),
- '-p', authentication::user_crypted_passwd($u, $isMD5),
+ '-p', authentication::user_crypted_passwd($u, $authentication),
if_($uid, '-u', $uid), if_($gid, '-g', $gid),
if_($u->{realname}, '-c', $u->{realname}),
if_($u->{home}, '-d', $u->{home}, if_($u->{rename_from}, '-m')),
@@ -97,7 +97,7 @@ sub add_users {
alloc_user_faces($users);
foreach (@$users) {
- create_user($_, $authentication->{md5});
+ create_user($_, $authentication);
run_program::rooted($::prefix, "usermod", "-G", join(",", @{$_->{groups}}), $_->{name}) if !is_empty_array_ref($_->{groups});
addKdmIcon($_->{name}, delete $_->{auto_icon} || $_->{icon});
}