diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-16 14:35:34 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-16 14:35:34 -0600 |
| commit | c34982439dce7fbd7a9686f2f73cc170d994ab50 (patch) | |
| tree | 2aaece4839cb412a7cda3dab213a7c03b5de144d | |
| parent | 458cb238e8cdde8d19977c1908c85ad32a7a6c78 (diff) | |
| parent | 30128bd9302f7db5aee5991ebcbbdbde9852690b (diff) | |
| download | puppet-c34982439dce7fbd7a9686f2f73cc170d994ab50.tar.gz puppet-c34982439dce7fbd7a9686f2f73cc170d994ab50.tar.xz puppet-c34982439dce7fbd7a9686f2f73cc170d994ab50.zip | |
Merge commit 'turnbull/ticket_1024' into 0.24.x
| -rw-r--r-- | lib/puppet/provider/nameservice/directoryservice.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb index b2ccfbd4e..973a62f6e 100644 --- a/lib/puppet/provider/nameservice/directoryservice.rb +++ b/lib/puppet/provider/nameservice/directoryservice.rb @@ -178,11 +178,8 @@ class DirectoryService < Puppet::Provider::NameService # This method spits out proper DSCL commands for us. # We EXPECT name to be @resource[:name] when called from an instance object. - # JJM: With dscl, the domain "/" is always the default local domain. - # The domain /Search will search all domains, and you may - # get at specific domains with /LDAPv3/server1.foobar.com, - # /LDAPv3/server2.foobar.com, etc... - command_vector = [ command(:dscl), "-url", "/" ] + # There are two ways to specify paths in 10.5. See man dscl. + command_vector = [ command(:dscl), "-url", "." ] # JJM: The actual action to perform. See "man dscl" # Common actiosn: -create, -delete, -merge, -append, -passwd command_vector << ds_action |