diff options
| author | Luke Kanies <luke@madstop.com> | 2008-08-18 11:47:40 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-08-18 11:47:40 -0500 |
| commit | e3971b9751141cd448a8197da024be43581f6dcd (patch) | |
| tree | 3ae780db3d9dae0a4df10ec24f928bf3a844e749 /lib/puppet/util/ldap/manager.rb | |
| parent | 025edc5c3737f476119df4bab73ebdc68be19430 (diff) | |
| parent | 2ec4e298c3274abc8eaad4230bca8d39a48d2e35 (diff) | |
| download | puppet-e3971b9751141cd448a8197da024be43581f6dcd.tar.gz puppet-e3971b9751141cd448a8197da024be43581f6dcd.tar.xz puppet-e3971b9751141cd448a8197da024be43581f6dcd.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
test/util/posixtest.rb
Diffstat (limited to 'lib/puppet/util/ldap/manager.rb')
| -rw-r--r-- | lib/puppet/util/ldap/manager.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/ldap/manager.rb b/lib/puppet/util/ldap/manager.rb index 9761fc753..8d444195e 100644 --- a/lib/puppet/util/ldap/manager.rb +++ b/lib/puppet/util/ldap/manager.rb @@ -80,7 +80,7 @@ class Puppet::Util::Ldap::Manager # Calculate the dn for a given resource. def dn(name) - ["#{rdn.to_s}=%s" % name, base].join(",") + ["%s=%s" % [rdn, name], base].join(",") end # Convert an ldap-style entry hash to a provider-style hash. |