use list

1 files changed, 4 insertions, 2 deletions

diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index 80d98bd5..2aa837b5 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -90,7 +90,7 @@ my @loglevel = qw(0 1 2 3 4 5 6 7 8 9);
 
 $o->{pages} = {
 	       welcome => {
-			   name => N('Samba Configuration Wizard') . "\n\n" . N('Samba allows your server to behave as a file and print server for workstations running non-Linux systems.') . "\n\n" . N('This wizard will help you configuring the Samba services of your server.') . "\n\n" . N('PDC: primary domain controller') . "\n" . N('BDC: backup domain controller') . "\n" . N('standalone: standalone server') . "\n" . N('Member: member of a domain'),
+			   name => N('Samba Configuration Wizard') . "\n\n" . N('Samba allows your server to behave as a file and print server for workstations running non-Linux systems.') . "\n\n" . N('PDC: primary domain controller') . "\n" . N('BDC: backup domain controller') . "\n" . N('standalone: standalone server') . "\n" . N('Member: member of a domain'),
 			   no_back => 1,
                            pre => sub {
 			     if (-f $wiz_samba_etc) {
@@ -113,7 +113,7 @@ $o->{pages} = {
 			       return 'member' }
                            },
                            data => [
-                                    { label => N("Wich type of Samba server do you you want:"), val => \$o->{var}{wiz_type}, list => [ keys %type ], format => sub { $type{$_[0]} } },
+                                   { label => N("Wich type of Samba server do you you want:") . " ", val => \$o->{var}{wiz_type}, type => 'list', list => [ keys %type ], format => sub { $type{$_[0]} } },
                                    ],
                           },
 	       pdc => {
@@ -398,9 +398,11 @@ sub global_special_options() {
     $o->{var}{wiz_wins_support} and $samba->{global}{'wins support'} = $o->{var}{wiz_wins_support};
     $o->{var}{wiz_password_server} and $samba->{global}{'password server'} = $o->{var}{wiz_password_server};
     $o->{var}{wiz_admin_users} and $samba->{global}{'admin users'} = $o->{var}{wiz_admin_users};
+    $samba->{global}{'add machine script'} = "/usr/sbin/useradd -d /dev/null -g machines -c 'Machine Account' -s /bin/false -M '%u'";
     # ldap options if needed
     if ($o->{var}{wiz_passdb_backend_yn} =~ /yes/) {
       $samba->{global}{'ldap passwd sync'} = "yes";
+      $samba->{global}{'add machine script'} and delete $samba->{global}{'add machine script'};
       $o->{var}{wiz_ldap_suffix} and $samba->{global}{'ldap suffix'} = $o->{var}{wiz_ldap_suffix};
       $o->{var}{wiz_ldap_admin_dn} and $samba->{global}{'ldap admin dn'} = $o->{var}{wiz_ldap_admin_dn};
       $o->{var}{wiz_passdb_backend} and $samba->{global}{'passdb backend'} = $o->{var}{wiz_passdb_backend};