Copying the "commands" and "confine" statements to the actual dscl providers, since they need to be there to determine where the providers are suitable. Otherwise base classes could unnecessarily affect how subclasses work.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2751 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 8 insertions, 6 deletions

diff --git a/lib/puppet/provider/group/directoryservice.rb b/lib/puppet/provider/group/directoryservice.rb
index e92ef254a..406622224 100644
--- a/lib/puppet/provider/group/directoryservice.rb
+++ b/lib/puppet/provider/group/directoryservice.rb
@@ -15,10 +15,9 @@
 require 'puppet/provider/nameservice/directoryservice'
 
 Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider::NameService::DirectoryService do
-    desc "Group management using DirectoryService ... Fin. ;)"
-    
-    # JJM: Do we really need commands defined here?
-    # commands :dscl => "/usr/bin/dscl"
-    # defaultfor :operatingsystem => :darwin
+    desc "Group management using DirectoryService on OS X."
     
+    commands :dscl => "/usr/bin/dscl"
+    confine :operatingsystem => :darwin
+    #defaultfor :operatingsystem => :darwin
 end
diff --git a/lib/puppet/provider/user/directoryservice.rb b/lib/puppet/provider/user/directoryservice.rb
index 2116d7e74..68cb79852 100644
--- a/lib/puppet/provider/user/directoryservice.rb
+++ b/lib/puppet/provider/user/directoryservice.rb
@@ -15,7 +15,10 @@
 require 'puppet/provider/nameservice/directoryservice'
 
 Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider::NameService::DirectoryService do
-    desc "User management using DirectoryService ... Fin. ;)"
+    desc "User management using DirectoryService on OS X."
+
+    commands :dscl => "/usr/bin/dscl"
+    confine :operatingsystem => :darwin
     
     # JJM: DirectoryService can manage passwords.
     #      This needs to be a special option to dscl though (-passwd)