Enable global guest-account setting

diff --git a/manifests/server.pp b/manifests/server.pp
index 8a5853cdfb4de5163e08d36c34f1dd7b46d5e8ab..027471c6cfb185385a1a41892917029010639c8d 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -12,7 +12,8 @@ class samba::server($interfaces = '',
                     $load_printers = '',
                     $printing = '',
                     $printcap_name = '',
-                    $map_to_guest = '',
+                    $map_to_guest = 'Never',
+                                       $guest_account = '',
                     $disable_spoolss = '',
                     $kernel_oplocks = '',
                     $pam_password_change = '',
@@ -52,6 +53,7 @@ class samba::server($interfaces = '',
     'printing':             value => $printing;
     'printcap name':        value => $printcap_name;
     'map to guest':         value => $map_to_guest;
+       'guest account':        value => $guest_account;
     'disable spoolss':      value => $disable_spoolss;
     'kernel oplocks':       value => $kernel_oplocks;
     'pam password change':  value => $pam_password_change;

diff --git a/manifests/server/share.pp b/manifests/server/share.pp
index c6820556cd5c7cc42aa45a70577b820ef3896da0..e5e23f1730768f3359fbe94d18f9d9a79c6b338b 100644 (file)
--- a/manifests/server/share.pp
+++ b/manifests/server/share.pp
@@ -11,7 +11,6 @@ define samba::server::share($ensure = present,
                             $force_directory_mask = '',
                             $force_group = '',
                             $force_user = '',
-                            $guest_account = '',
                             $guest_ok = '',
                             $guest_only = '',
                             $hide_unreadable = '',
@@ -94,10 +93,6 @@ define samba::server::share($ensure = present,
         ''      => "rm  \"${target}/force user\"",
         default => "set \"${target}/force user\" '${force_user}'",
       },
-      $guest_account ? {
-        ''      => "rm  \"${target}/guest account\"",
-        default => "set \"${target}/guest account\" '${guest_account}'",
-      },
       $guest_ok ? {
         true    => "set \"${target}/guest ok\" yes",
         false   => "set \"${target}/guest ok\" no",