openldap_password inserting newline in LDIF

[lazyfrosch]

Sorry for one more issue ;)

I just observed this while adding other databases:

openldap_database { 'test':
    directory => '/var/lib/ldap.test',
    suffix    => $suffix,
    rootdn    => "cn=Manager,${suffix}",
    rootpw    => openldap_password('secret'),
    provider  => olc,
}

ldap_add: Other (e.g., implementation specific) error (80)
    additional info: <olcRootPW> can only be set when rootdn is under suffix

While enabling puts debug output I noticed a newline in the LDIF data

olcDbDirectory: /var/lib/ldap.test
olcRootDN: cn=Manager,dc=...
olcRootPW: {SSHA}XXX

olcSuffix: dc=...

So maybe just a missing strip?

When adding a ".strip!" the problem is gone. Not sure if thats the best solution, because I'm no Ruby developer ;)

[mcanevet]

@lazyfrosch where do you add ".strip!" ?

[lazyfrosch]

Just after the slappasswd execution.

diff --git a/lib/puppet/parser/functions/openldap_password.rb b/lib/puppet/parser/functions/openldap_password.rb
index bdfeefb..8ac8be8 100644
--- a/lib/puppet/parser/functions/openldap_password.rb
+++ b/lib/puppet/parser/functions/openldap_password.rb
@@ -11,6 +11,6 @@ module Puppet::Parser::Functions
     scheme = args[1] if args[1]
     command << ['-h', scheme] if scheme

-    Puppet::Util::Execution.execute(command.flatten)
+    Puppet::Util::Execution.execute(command.flatten).strip!
   end
 end

[mcanevet]

@lazyfrosch what ruby version are you using ?

[lazyfrosch]

@mcanevet The system is a vagrant box based on Debian Wheezy, Ruby is 1.9.3.194-8.1+deb7u2

[mcanevet]

@lazyfrosch I'm not sure that '!' is mandatory in this case.
Could you provide a PR with your patch (without '!' if it's not necessary) ?