From 2b997a9992cb246ae9e6aecbb52e9daed2680d91 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Wed, 24 Aug 2022 19:03:16 +0000 Subject: [PATCH] GUACAMOLE-1661: Restore logic to not index records by login if hostname is already defined. --- .../org/apache/guacamole/vault/ksm/secret/KsmClient.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmClient.java b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmClient.java index a573259b5..fd339dac5 100644 --- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmClient.java +++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/java/org/apache/guacamole/vault/ksm/secret/KsmClient.java @@ -322,8 +322,11 @@ public class KsmClient { if (!confService.getMatchUserRecordsByDomain()) domain = null; - // Store the login by username and domain - addRecordForLogin(record, username, domain); + // Store based on login ONLY if no hostname (will otherwise + // result in ambiguous entries for servers tied to identical + // accounts) + if (hostname == null) + addRecordForLogin(record, username, domain); }