partial rework of Windows PDC authentication, still need

to run smbpasswd after network is up

2 files changed, 12 insertions, 8 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 8e60840bf..fd386512b 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -468,12 +468,15 @@ sub setAuthentication {
 	    cp_af($f, "$f.orig");
 	    cp_af("$f-winbind", $f);
 	}
-	write_smb_conf($o, $domain);
+	write_smb_conf($domain);
 	run_program::rooted($o->{prefix}, "chkconfig", "--level", "35", "winbind", "on");
 	mkdir "$o->{prefix}/home/$domain", 0755;
+	
+	#- just temporary until samba packages fixed
+	mkdir "$o->{prefix}/var/log/samba", 0755;
+        mkdir "$o->{prefix}/var/run/samba", 0755;
 
-	#- finally join the machine to the Windoze domain
-	run_program::rooted($o->{prefix}, "/usr/bin/smbpasswd", "-j", $domain, "-r", $winbind);
+	#- defer running smbpassword - no network yet
     }
 }
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 9ea6bafe5..68b77dbe7 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1133,12 +1133,13 @@ sub setRootPassword {
     if ($auth eq __("Windows PDC")) {
 	#- maybe we should browse the network like diskdrake --smb and get the 'doze server names in a list 
 	#- but networking isn't setup yet necessarily
+	$o->ask_warn('', _("For this to work for a W2K PDC, you will probably need to have the admin run: C:\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add and reboot the server.\nYou will also need the username/password of a Domain Admin to join the machine to the Windows(TM) domain.\nIf networking is not yet enabled, Drakx will attempt to join the domain after the network setup step.\nShould this setup fail for some reason and PDC authentication is not working, run 'smbpasswd -j DOMAIN -U USER%PASSWORD' using your Windows(tm) Domain, and Admin Username/Password, after system boot.\nThe command 'wbinfo -t' will test whether your authentication secrets are good."));
 	$o->ask_from('',
-		     _("Authentication Windows PDC"),
-		     [ { label => _("Windows Domain"), val => \ ($o->{netc}{WINDOMAIN} ||= $o->{netc}{DOMAINNAME}) },
-		       { label => _("PDC Server Name"), val => \$o->{authentication}{winbind} },
-		     ]) or goto &setRootPassword;
-	$o->ask_warn('', _("For this to work for a W2K PDC, you will probably need to have the admin run: C:\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add and reboot the server"));
+			_("Authentication Windows PDC"),
+			[ { label => _("Windows Domain"), val => \ ($o->{netc}{WINDOMAIN} ||= $o->{netc}{DOMAINNAME}) },
+			  { label => _("Domain Admin User Name"), val => \$o->{authentication}{winbind} },
+			  { label => _("Domain Admin Password"), val => \$o->{authentication}{winpass}, hidden => 1  },
+			]) or goto &setRootPassword;
     } else { $o->{authentication}{winbind} = '' }
     install_steps::setRootPassword($o);
 }