Ticket #219: locking.patch

a/lib/puppet/provider/nameservice.rb

@@ -186 +186 @@
-        self.ensure = :absent
-    end
-
-    def locked
-        self.ensure = :locked
-    end
-
-    def unlocked
-        self.ensure = :unlocked
-    end
-
-    def ensure
-        if exists?
-            :present
@@ -202 +194 @@
-        end
-    end
-
+    def locked
+        self.status = :locked
+    end
+
+    def unlocked
+        self.status = :unlocked
+    end
+
+    #def status
+    #    if exists?
+    #        :unlocked
+    #    else
+    #        :locked
+    #    end
+    #end
+
+    def status=(value)
+        cmd = nil
+        event = nil
+        case value
+        when :unlocked
+            unless exists?
+                info "absent - cannot unlock"
+                return nil
+            end
+
+            cmd = self.unlockcmd
+            type = "unlock"
+        when :locked
+            # FIXME - what happens when already locked?
+            
+            cmd = self.lockcmd   
+            type = "lock"
+        end
+
+        begin
+            execute(cmd)
+        rescue Puppet::ExecutionFailure => detail
+            raise Puppet::Error, "Could not %s %s %s: %s" %
+                [type, @resource.class.name, @resource.name, detail]
+        end
+    end
+ 
-    # This is only used when creating or destroying the object.
-    def ensure=(value)
-        cmd = nil
@@ -229 +264 @@
-            # blah blah, define elsewhere, blah blah
-            cmd = self.addcmd
-            type = "create"
-        when :locked
-            unless exists?
-            #the object doesn't exist - can't lock it
-                    info "is absent - cannot lock"
-                    return nil
-            end
-
-            cmd = self.lockcmd
-            type = "locked"
-        when :unlocked
-            unless exists?
-            #the object doesn't exist - can't unlock it
-                    info "is absent - cannot unlock"
-                    return nil
-            end
-  
-            cmd = self.unlockcmd
-            type = "unlocked"
-        end
-                   
-        begin

a/lib/puppet/type/user.rb

@@ -33 +33 @@
-                provider.delete
-            end
-
-            newvalue(:locked, :event => :user_locked) do
-                provider.locked
-            end
-
-            newvalue(:unlocked, :event => :user_unlocked) do
-                provider.unlocked
-            end
-
-            desc "The basic state that the object should be in."
-
-            # If they're talking about the thing at all, they generally want to
@@ -81 +73 @@
-
-        end
-
+        newproperty(:status) do
+            desc "The status of the user.  Can be specified as locked or 
+                  unlocked.  Status defaults to unlocked."
+
+            newvalue(:locked, :event => :user_locked) do
+                provider.locked
+            end
+
+            newvalue(:unlocked, :event => :user_unlocked) do
+                provider.unlocked
+            end
+      
+        end
+
-        newproperty(:uid) do
-            desc "The user ID.  Must be specified numerically.  For new users
-                being created, if no user ID is specified then one will be