From 7e472296d5c7890bf8a01c1e1ac1e9213bcc399c Mon Sep 17 00:00:00 2001
From: Stew Benedict <stewb@mandriva.org>
Date: Mon, 5 Aug 2002 23:13:54 +0000
Subject: smbpasswd call deferred with addToBeDone

---
 perl-install/install_any.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index fd386512b..445d8f3ca 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -439,7 +439,7 @@ sub addToBeDone(&$) {
 
 sub setAuthentication {
     my ($o) = @_;
-    my ($shadow, $md5, $ldap, $nis, $winbind) = @{$o->{authentication} || {}}{qw(shadow md5 LDAP NIS winbind)};
+    my ($shadow, $md5, $ldap, $nis, $winbind, $winpass) = @{$o->{authentication} || {}}{qw(shadow md5 LDAP NIS winbind winpass)};
     my $p = $o->{prefix};
     #- obsoleted always enabled (in /etc/pam.d/system-auth furthermore) #any::enableMD5Shadow($p, $shadow, $md5);
     any::enableShadow($p) if $shadow;
@@ -477,6 +477,11 @@ sub setAuthentication {
         mkdir "$o->{prefix}/var/run/samba", 0755;
 
 	#- defer running smbpassword - no network yet
+	$winbind = $winbind . "%" . $winpass;
+	addToBeDone {
+	    install_steps::upNetwork($o, 'pppAvoided');
+	    run_program::rooted($o->{prefix}, "/usr/bin/smbpasswd", "-j", $domain, "-U", $winbind);
+	} 'configureNetwork';
     }
 }
 
-- 
cgit v1.2.1