Merge branch 'branches/rudder/5.0'

RaphaelGauthier · Nov 16, 2018 · d4f53f1 · d4f53f1
2 parents 96e6210 + af78181
commit d4f53f1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/rudder-core/src/main/scala/com/normation/rudder/services/servers/RemoveNodeService.scala b/rudder-core/src/main/scala/com/normation/rudder/services/servers/RemoveNodeService.scala
@@ -48,6 +48,7 @@ import com.normation.eventlog.ModificationId
 import com.normation.inventory.domain.NodeId
 import com.normation.inventory.domain.AcceptedInventory
 import com.normation.inventory.domain.RemovedInventory
+import com.normation.inventory.domain.UndefinedKey
 import com.normation.inventory.ldap.core.InventoryDit
 import com.normation.inventory.ldap.core.LDAPConstants
 import com.normation.inventory.ldap.core.LDAPFullInventoryRepository
@@ -281,7 +282,7 @@ class RemoveNodeServiceImpl(
   private def removeKeyCertification(nodeId: NodeId): Box[LDIFChangeRecord] = {
     for {
       con <- ldap
-      res <- con.modify(deletedDit.NODES.NODE.dn(nodeId.value), new Modification(ModificationType.DELETE, LDAPConstants.A_KEY_STATUS))
+      res <- con.modify(deletedDit.NODES.NODE.dn(nodeId.value), new Modification(ModificationType.REPLACE, LDAPConstants.A_KEY_STATUS, UndefinedKey.value))
     } yield {
       res
     }