Fix name of 'force directory mode' option

Previously the class was setting a value for 'force directory mask' which
was getting ignored by samba. Running testparm -v would give:

  Unknown parameter encountered: "force directory mask"
  Ignoring unknown parameter "force directory mask"

The correct option name is 'force directory mode' according to the man
page.

diff --git a/manifests/server/share.pp b/manifests/server/share.pp
index e5e23f1730768f3359fbe94d18f9d9a79c6b338b..7f8191c45b3deac4a047b6cdcdc2cad74d75466e 100644 (file)
--- a/manifests/server/share.pp
+++ b/manifests/server/share.pp
@@ -8,7 +8,7 @@ define samba::server::share($ensure = present,
                             $create_mask = '',
                             $directory_mask = '',
                             $force_create_mask = '',
-                            $force_directory_mask = '',
+                            $force_directory_mode = '',
                             $force_group = '',
                             $force_user = '',
                             $guest_ok = '',
@@ -81,9 +81,9 @@ define samba::server::share($ensure = present,
         ''      => "rm  \"${target}/force create mask\"",
         default => "set \"${target}/force create mask\" '${force_create_mask}'",
       },
-      $force_directory_mask ? {
-        ''      => "rm  \"${target}/force directory mask\"",
-        default => "set \"${target}/force directory mask\" '${force_directory_mask}'",
+      $force_directory_mode ? {
+        ''      => "rm  \"${target}/force directory mode\"",
+        default => "set \"${target}/force directory mode\" '${force_directory_mode}'",
       },
       $force_group ? {
         ''      => "rm  \"${target}/force group\"",

diff --git a/spec/acceptance/basic_samba_spec.rb b/spec/acceptance/basic_samba_spec.rb
index 0dd6ac6e47d748cce584736af1c4e99936a188b8..76e7f9fd002161d9fc093dad3cde2cc087665b7a 100644 (file)
--- a/spec/acceptance/basic_samba_spec.rb
+++ b/spec/acceptance/basic_samba_spec.rb
@@ -18,7 +18,7 @@ describe 'basic samba' do
         create_mask          => 0777,
         force_create_mask    => 0777,
         directory_mask       => 0777,
-        force_directory_mask => 0777,
+        force_directory_mode => 0777,
         force_group          => 'group',
         force_user           => 'user',
       }