Skip to content

Commit 2f3c109

Browse files
committed
Fix unsafe interpolations
We now have puppet-lint-check_unsafe_interpolations and it detect some issues. Fix them.
1 parent c630df5 commit 2f3c109

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

manifests/server/config.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
# preseeding files so we need to manualy bootstrap cn=config (but not the
7272
# databases).
7373
exec { 'bootstrap cn=config':
74-
command => "/bin/sed -e 's/@BACKEND@/mdb/g' -e '/^# The database definition.$/q' /usr/share/slapd/slapd.init.ldif | /usr/sbin/slapadd -F ${openldap::server::confdir} -b cn=config",
74+
command => "/bin/sed -e 's/@BACKEND@/mdb/g' -e '/^# The database definition.$/q' /usr/share/slapd/slapd.init.ldif | /usr/sbin/slapadd -F ${openldap::server::confdir.stdlib::shell_escape} -b cn=config",
7575
provider => 'shell',
7676
creates => "${openldap::server::confdir}/cn=config.ldif",
7777
user => $openldap::server::owner,
@@ -162,7 +162,7 @@
162162
$ldif = file('openldap/cn-config.ldif')
163163
exec { 'bootstrap cn=config':
164164
path => '/usr/local/sbin',
165-
command => "echo '${ldif}' | slapadd -n 0 -F ${openldap::server::confdir}",
165+
command => "echo ${ldif.stdlib::shell_escape} | slapadd -n 0 -F ${openldap::server::confdir.stdlib::shell_escape}",
166166
creates => "${openldap::server::confdir}/cn=config.ldif",
167167
provider => 'shell',
168168
user => $openldap::server::owner,

manifests/server/install.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# installation will succed. The module will then be able to tune slapd
1212
# accoding to the user needs and finally start (and unmak) the service.
1313
exec { 'mask-before-openldap-install':
14-
command => "systemctl mask ${openldap::server::service}",
14+
command => "systemctl mask ${openldap::server::service.stdlib::shell_escape}",
1515
unless => 'test -x /usr/sbin/slapd',
1616
creates => "/etc/systemd/system/${openldap::server::service}.service",
1717
path => '/bin:/usr/bin',

0 commit comments

Comments
 (0)