Windows PDC -> Windows Domain, don't make samba dirs - samba fixed now

2 files changed, 5 insertions, 9 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 16884f2c1..d2394f537 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -472,10 +472,6 @@ sub setAuthentication {
 	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;
-
 	#- defer running smbpassword - no network yet
 	$winbind = $winbind . "%" . $winpass;
 	addToBeDone {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 4aceb2a35..3b0a1f455 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1088,7 +1088,7 @@ sub setRootPassword {
     my $sup = $o->{superuser} ||= {};
     my $auth = ($o->{authentication}{LDAP} && __("LDAP") ||
 		$o->{authentication}{NIS} && __("NIS") ||
-		$o->{authentication}{winbind} && __("Windows PDC") ||
+		$o->{authentication}{winbind} && __("Windows Domain") ||
 		__("Local files"));
     $sup->{password2} ||= $sup->{password} ||= "";
 
@@ -1111,7 +1111,7 @@ sub setRootPassword {
 { label => _("Password"), val => \$sup->{password},  hidden => 1 },
 { label => _("Password (again)"), val => \$sup->{password2}, hidden => 1 },
   if_($::expert,
-{ label => _("Authentication"), val => \$auth, list => [ __("Local files"), __("LDAP"), __("NIS"), __("Windows PDC") ], format => \&translate },
+{ label => _("Authentication"), val => \$auth, list => [ __("Local files"), __("LDAP"), __("NIS"), __("Windows Domain") ], format => \&translate },
   ),
 			 ]) or return;
 
@@ -1132,12 +1132,12 @@ sub setRootPassword {
 		       { label => _("NIS Server"), val => \$o->{authentication}{NIS}, list => ["broadcast"], not_edit => 0 },
 		     ]) or goto &setRootPassword;
     } else { $o->{authentication}{NIS} = '' }
-    if ($auth eq __("Windows PDC")) {
+    if ($auth eq __("Windows Domain")) {
 	#- 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_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 domain 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"),
+			_("Authentication Windows Domain"),
 			[ { 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  },