Skip to content

Fix openldap_schema replace without attribute types #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2023
Merged

Fix openldap_schema replace without attribute types #393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions lib/puppet/provider/openldap_schema/olc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,11 @@ def self.schemaToLdifReplace(schema, name)
ldif.push('-')
end

ldif.push('replace: olcAttributeTypes')
ldif.push(*attrType)
ldif.push('-')
unless attrType.empty?
ldif.push('replace: olcAttributeTypes')
ldif.push(*attrType)
ldif.push('-')
end

ldif.push('replace: olcObjectClasses')
ldif.push(*objClass)
Expand Down Expand Up @@ -154,9 +156,11 @@ def self.ldifReplace(ldif, name)
new_ldif.push('-')
end

new_ldif.push('replace: olcAttributeTypes')
new_ldif.push(*attrType)
new_ldif.push('-')
unless attrType.empty?
new_ldif.push('replace: olcAttributeTypes')
new_ldif.push(*attrType)
new_ldif.push('-')
end

new_ldif.push('replace: olcObjectClasses')
new_ldif.push(*objClass)
Expand Down