From 013de3b04fc467137a0fea07f0ca0f2e00fecc11 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 30 Nov 2004 15:29:47 +0000
Subject: backport HEAD changes used by finish-install

---
 perl-install/standalone/adduserdrake | 14 ++++----------
 perl-install/standalone/drakauth     |  4 ++--
 2 files changed, 6 insertions(+), 12 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;
diff --git a/perl-install/standalone/drakauth b/perl-install/standalone/drakauth
index 1d89e08d7..c68a75b84 100755
--- a/perl-install/standalone/drakauth
+++ b/perl-install/standalone/drakauth
@@ -30,8 +30,8 @@ $in->ask_from(N("Authentication"), authentication::kind2description(),
 authentication::ask_parameters($in, $netc, $authentication, $kind) or goto main;
 
 eval { 
-    authentication::set($in, $netc, $authentication, sub { my ($f) = @_; $f->() });
-    network::network::write_conf("$::prefix/etc/sysconfig/network", $netc);
+    authentication::set($in, $netc, $authentication);
+    network::network::write_conf($netc);
 };
 if (my $err = $@) {
     $in->ask_warn(N("Error"), formatError($err));
-- 
cgit v1.2.1