From d2afb181655c6c89f17fd7dc184a6dc790bfc099 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 30 Nov 2004 10:23:54 +0000
Subject: - rely on adduser(8) to set the users password instead of using
 write_passwd_user() - use adduser(8) during install (we now use the same code
 during and after install)

---
 perl-install/standalone/adduserdrake | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake
index 40659017f..a2d380766 100755
--- a/perl-install/standalone/adduserdrake
+++ b/perl-install/standalone/adduserdrake
@@ -6,12 +6,10 @@ use standalone;     #- warning, standalone must be loaded very first, for 'expla
 
 use common;
 use interactive;
+use security::level;
+use authentication;
 use any;
 
-my $isMD5 = cat_("/etc/pam.d/system-auth") =~ /md5/;
-my $isShadow = cat_("/etc/pam.d/system-auth") =~ /shadow/;
-
-
 my $users = []; 
 my $in;
 
@@ -19,13 +17,9 @@ if (my @l = grep { ! /^-/ } @ARGV) {
     $users = [ map { { name => $_, realname => $_ } } @l ];
 } else {
     $in = 'interactive'->vnew('su');
-    any::ask_users($in, $users, $ENV{SECURE_LEVEL}, []);
+    any::ask_users($in, $users, security::level::get(), []);
 }
 
-system("adduser", $_->{name}) foreach @$users;
-any::write_passwd_user($_, $isMD5) foreach @$users;
-system("pwconv") if $isShadow;
-
-any::addUsers($users);
+any::add_users($users, authentication::get());
 
 $in->exit(0) if $in;
-- 
cgit v1.2.1