Skip to content

Commit cdbded2

Browse files
authored
Merge pull request #393 from dmaes/master
openldap_schema: fix replace w/o attribute types
2 parents 61aa9b1 + f25ce32 commit cdbded2

File tree

1 file changed

+10
-6
lines changed
  • lib/puppet/provider/openldap_schema

1 file changed

+10
-6
lines changed

lib/puppet/provider/openldap_schema/olc.rb

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,11 @@ def self.schemaToLdifReplace(schema, name)
106106
ldif.push('-')
107107
end
108108

109-
ldif.push('replace: olcAttributeTypes')
110-
ldif.push(*attrType)
111-
ldif.push('-')
109+
unless attrType.empty?
110+
ldif.push('replace: olcAttributeTypes')
111+
ldif.push(*attrType)
112+
ldif.push('-')
113+
end
112114

113115
ldif.push('replace: olcObjectClasses')
114116
ldif.push(*objClass)
@@ -154,9 +156,11 @@ def self.ldifReplace(ldif, name)
154156
new_ldif.push('-')
155157
end
156158

157-
new_ldif.push('replace: olcAttributeTypes')
158-
new_ldif.push(*attrType)
159-
new_ldif.push('-')
159+
unless attrType.empty?
160+
new_ldif.push('replace: olcAttributeTypes')
161+
new_ldif.push(*attrType)
162+
new_ldif.push('-')
163+
end
160164

161165
new_ldif.push('replace: olcObjectClasses')
162166
new_ldif.push(*objClass)

0 commit comments

Comments
 (0)