Merge pull request #393 from dmaes/master

openldap_schema: fix replace w/o attribute types
voxpupuli · Aug 29, 2023 · cdbded2 · cdbded2
2 parents 61aa9b1 + f25ce32
commit cdbded2
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/lib/puppet/provider/openldap_schema/olc.rb b/lib/puppet/provider/openldap_schema/olc.rb
@@ -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)
@@ -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)