diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-20 10:13:33 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-20 10:13:33 -0500 |
| commit | 3e13bd59689a27a393c847bdbed3ac38765d79e9 (patch) | |
| tree | a3d608ddeecc26e55b1a61049112ba4c92de7ab9 /lib | |
| parent | ee4be4f78f7c904dbe5873ff7b44993d1440da41 (diff) | |
| download | puppet-3e13bd59689a27a393c847bdbed3ac38765d79e9.tar.gz puppet-3e13bd59689a27a393c847bdbed3ac38765d79e9.tar.xz puppet-3e13bd59689a27a393c847bdbed3ac38765d79e9.zip | |
Intermediate commit so I can move on to other things.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/provider/group/ldap.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/provider/user/ldap.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/group/ldap.rb b/lib/puppet/provider/group/ldap.rb index 632358ff1..5af400a4e 100644 --- a/lib/puppet/provider/group/ldap.rb +++ b/lib/puppet/provider/group/ldap.rb @@ -12,7 +12,7 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do as it iterates across all existing groups to pick the appropriate next one." - confine :true => Puppet.features.ldap? + confine :true => Puppet.features.ldap?, :false => (Puppet[:ldapuser] == "") # We're mapping 'members' here because we want to make it # easy for the ldap user provider to manage groups. This diff --git a/lib/puppet/provider/user/ldap.rb b/lib/puppet/provider/user/ldap.rb index ba91a871e..d670ad435 100644 --- a/lib/puppet/provider/user/ldap.rb +++ b/lib/puppet/provider/user/ldap.rb @@ -12,7 +12,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do as it iterates across all existing users to pick the appropriate next one." - confine :true => Puppet.features.ldap? + confine :feature => :ldap, :false => (Puppet[:ldapuser] == "") manages(:posixAccount, :person).at("ou=People").named_by(:uid).and.maps :name => :uid, :password => :userPassword, |