fix default configuration file, remove BDC, member and ldap support

(perhaps will be re-enabled later)

1 files changed, 12 insertions, 11 deletions

diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index 409b5ef5..192290db 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -72,7 +72,7 @@ my $o = {
 	};
 
 # we ask glueconf to give us the structure representing /etc/samba/smb.conf
-if (!-f "/etc/samba/smb.conf") { cp_af("/usr/share/wizards/samba_wizard/smb.conf.default", "/etc/samba/smb.conf"); }
+if (!-f "/etc/samba/smb.conf") { cp_af("/usr/share/wizards/samba_wizard/scripts/smb.conf.default", "/etc/samba/smb.conf"); }
 my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf', show_commented_info => 1 });
 
 #debug
@@ -80,10 +80,10 @@ use Data::Dumper;
 print Dumper($samba);
 
 my %type = (
-	    1 => N('BDC - backup domain controller (need PDC+LDAP)'),
+	    #	    1 => N('BDC - backup domain controller (need PDC+LDAP)'),
 	    2 => N('PDC - primary domain controller'),
 	    3 => N('Standalone - standalone server'),
-	    4 => N('Member - member of a domain'),
+	    #	    4 => N('Member - member of a domain'),
 	   );
 
 my @yesorno = qw(yes no); push @yesorno, "";
@@ -118,7 +118,7 @@ $o->{pages} = {
                                    ],
                           },
 	       pdc => {
-		       name => N('PDC server: primary domain controller')  . "\n\n" . N('Server configured as a PDC is responsible for Windows authentication throughout the domain.') . "\n" . N('Single server installations may use smbpasswd or tdbsam password backends, but large installations should use the LDAP backend to provide centralized management of both Posix users and Windows users.') . "\n" . N('Domain master = yes, causes the server to register the NetBIOS name <pdc name>1B. This name will be recognized by other servers.'),
+		       name => N('PDC server: primary domain controller')  . "\n\n" . N('Server configured as a PDC is responsible for Windows authentication throughout the domain.') . "\n" . N('Single server installations may use smbpasswd or tdbsam password backends') . "\n" . N('Domain master = yes, causes the server to register the NetBIOS name <pdc name>1B. This name will be recognized by other servers.'),
 		       pre => sub {
 			       $o->{var}{wiz_domain_master} = "yes";
 			       $o->{var}{wiz_security} = "user";
@@ -133,9 +133,10 @@ $o->{pages} = {
 				 $o->{var}{wiz_passdb_backend_yn} = "no";
 			       }
 			     },
-		       post => sub {
-			 $o->{var}{wiz_passdb_backend_yn} =~ /yes/ and return 'ldap_conf';
-		       },
+		       next => 'ask_workgroup',
+#		       post => sub {
+#			 $o->{var}{wiz_passdb_backend_yn} =~ /yes/ and return 'ldap_conf';
+#		       },
 		       data => [
 				{ label => N('Domain logons:'), fixed_val => \$o->{var}{wiz_domain_logons} },
 				{ label => N('Domain master:'), fixed_val => \$o->{var}{wiz_domain_master} },
@@ -143,7 +144,7 @@ $o->{pages} = {
 				{ label => N('Wins support:'), val => \$o->{var}{wiz_wins_support}, fixed_list => \@yesorno },
 				{ label => N('admin users:'), val => \$o->{var}{wiz_admin_users}, help => N('root @adm') },
 				{ label => N('Os level:'), fixed_val => \$o->{var}{wiz_oslevel}, help =>N("The global os level option dictates the operating system level at which Samba will masquerade during a browser election. If you wish to have Samba win an election and become the master browser, you can set the level above that of the operating system on your network with the highest current value. ie: os level = 34") },
-				{ label => N('Use LDAP Passdb backend'), val => \$o->{var}{wiz_passdb_backend_yn}, fixed_list => \@yesorno },
+#				{ label => N('Use LDAP Passdb backend'), val => \$o->{var}{wiz_passdb_backend_yn}, fixed_list => \@yesorno },
 			       ],
 		       complete => sub {
 				    if (!$o->{var}{wiz_domain_master}) {
@@ -452,15 +453,15 @@ sub do_it {
   # global section
   $samba->{global}{workgroup} = $o->{var}{wiz_workgroup};
   $samba->{global}{'server string'} = $o->{var}{wiz_banner};
-  
+
   # add special global options
   global_special_options;
-  
+
   # log level in global section
   $o->{var}{wiz_log_file} and $samba->{global}{'log file'} = $o->{var}{wiz_log_file};
   $o->{var}{wiz_log_level} and $samba->{global}{'log level'} = $o->{var}{wiz_log_level};
   $o->{var}{wiz_max_log_size} and $samba->{global}{'max log size'} = $o->{var}{wiz_max_log_size};
-  
+
   write_conf_restart_smb();
   # remove wait message
   undef $w;