macauthorization type

1 files changed, 10 insertions, 30 deletions

diff --git a/lib/puppet/type/macauthorization.rb b/lib/puppet/type/macauthorization.rb
index c17471aa4..5e05d22a4 100644
--- a/lib/puppet/type/macauthorization.rb
+++ b/lib/puppet/type/macauthorization.rb
@@ -1,3 +1,5 @@
+require 'ruby-debug'
+
 Puppet::Type.newtype(:macauthorization) do
     
     @doc = "Manage authorization databases"
@@ -8,12 +10,14 @@ Puppet::Type.newtype(:macauthorization) do
         ["/etc/authorization"]
     end
     
+    # This probably shouldn't be necessary for properties that have declared
+    # themselves to be booleans already.
     def munge_boolean(value)
         case value
         when true, "true", :true:
-            true
+            :true
         when false, "false", :false
-            false
+            :false
         else
             raise Puppet::Error("munge_boolean only takes booleans")
         end
@@ -24,7 +28,6 @@ Puppet::Type.newtype(:macauthorization) do
         isnamevar
     end
     
-    # did I have to make this a property not a param so the provider can set it with ralsh?
     newproperty(:auth_type) do
         desc "type - can be a right a rule or a comment"
         newvalue(:right)
@@ -32,39 +35,23 @@ Puppet::Type.newtype(:macauthorization) do
         newvalue(:comment)
     end
     
-    # I wish I could use hyphens here... look into quoting
     newproperty(:allow_root, :boolean => true) do
         desc "Corresponds to 'allow-root' in the authorization store. hyphens not allowed..."
         newvalue(:true)
         newvalue(:false)
         
         munge do |value|
-            # case value
-            # when true, "true", :true:
-            #     true
-            # when false, "false", :false
-            #     false
-            # else
-            #     raise Puppet::Error("allow_root only takes booleans")
-            # end
-            munge_boolean(value)
+            @resource.munge_boolean(value)
         end
     end
     
     newproperty(:authenticate_user, :boolean => true) do
-        # desc "authenticate-user"
+        desc "authenticate-user"
         newvalue(:true)
         newvalue(:false)
         
         munge do |value|
-            case value
-            when true, "true", :true:
-                true
-            when false, "false", :false
-                false
-            else
-                raise Puppet::Error("munge_boolean only takes booleans")
-            end
+            @resource.munge_boolean(value)
         end
     end
 
@@ -101,14 +88,7 @@ Puppet::Type.newtype(:macauthorization) do
         newvalue(:false)
         
         munge do |value|
-            case value
-            when true, "true", :true:
-                :true
-            when false, "false", :false
-                :false
-            else
-                raise Puppet::Error("munge_boolean only takes booleans")
-            end
+            @resource.munge_boolean(value)
         end
     end