1 files changed, 11 insertions, 10 deletions
diff --git a/perl-install/standalone/drakauth b/perl-install/standalone/drakauth
index f091a3000..639d53adb 100755
--- a/perl-install/standalone/drakauth
+++ b/perl-install/standalone/drakauth
@@ -9,28 +9,29 @@ use interactive;
 use authentication;
 use network::network;
 
-my $netc = {};
-my $intf = {};
-read_all_conf('', $netc, $intf);
+my $net = {};
+network::network::read_net_conf($net);
 
 my $in = 'interactive'->vnew('su');
 
-
-my $authentication = {}; # TODO
+my $authentication = authentication::get();
 
 my $kind = authentication::to_kind($authentication);
+my $meta_class = { getVarsFromSh("/etc/sysconfig/system") }->{META_CLASS};
+my @kinds = authentication::kinds($in->do_pkgs, $meta_class);
 
 main:
-$in->ask_from('', '', 
+$in->ask_from(N("Authentication"), undef,
 	      [ 
-	       { label => N("Authentication"), val => \$kind, list => [ authentication::kinds() ], format => \&authentication::kind2description },
+	       { label => N("Authentication") },
+	       { val => \$kind, type => 'list' , list => \@kinds, format => \&authentication::kind2description_raw },
 	      ]) or $in->exit;
 
-authentication::ask_parameters($in, $netc, $authentication, $kind) or goto main;
+authentication::ask_parameters($in, $net, $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, $net, $authentication) or goto main;
+    network::network::write_network_conf($net); #- for NISDOMAIN
 };
 if (my $err = $@) {
     $in->ask_warn(N("Error"), formatError($err));