From 79fa107bce52b379c63c6b90e081dba1ac544ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Membr=C3=A9?= Date: Thu, 21 Dec 2023 17:39:18 +0100 Subject: [PATCH] fixup! fixup! Update NewNodeManager.scala Fixes #22197: We can accept a node with an existing hostname even if node_accept_duplicated_hostname is false --- .../com/normation/rudder/services/servers/NewNodeManager.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala index 4a14aed64d..0a96abbf02 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala @@ -900,7 +900,8 @@ class AcceptHostnameAndIp( // if not, we don't group them that the duplicate appears in the list noDuplicatesH <- if (duplicatesH.isEmpty) Full({}) else { - val startMessage = if (duplicates.size >= 2) { "There are already ${duplicatesH.size} nodes" } { "There is already a node" } + val startMessage = + if (duplicatesH.size >= 2) "There are already ${duplicatesH.size} nodes" else "There is already a node" Failure( s"${startMessage} with hostname '${name}' in Rudder. You can not add it again." )