Martin Peřina has uploaded a new change for review. Change subject: aaa: Server in LdapServers option are separated by ';' ......................................................................
aaa: Server in LdapServers option are separated by ';' LDAP servers in ConfigValue.LdapServers option are separated by semicolon. Change-Id: I5da2f60b889febb6fba7d8a06a1830f573802106 Bug-Url: https://bugzilla.redhat.com/1111071 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/Utils.java 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/28970/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java index 2554211..e167224 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/DirectorySearcher.java @@ -57,7 +57,7 @@ public List<?> find(final LdapQueryData queryData, final long resultCount) { final String domainName = queryData.getDomain(); List<String> ldapServerURIs = - Arrays.asList(configuration.getProperty("config.LdapServers").split(",")); + Arrays.asList(configuration.getProperty("config.LdapServers").split(";")); List<String> editableLdapServerURIs = new ArrayList<>(ldapServerURIs); if (log.isDebugEnabled()) { log.debug("Ldap server list: " + StringUtils.join(ldapServerURIs, ", ")); @@ -75,7 +75,7 @@ return null; } } - configuration.setProperty("config.LdapServers", StringUtils.join(editableLdapServerURIs, ",")); + configuration.setProperty("config.LdapServers", StringUtils.join(editableLdapServerURIs, ";")); return response; } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/Utils.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/Utils.java index b119032..4a75327 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/Utils.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/Utils.java @@ -48,7 +48,7 @@ String ldapURI = locator.constructURI("ldap", address, "389").toString(); ldapServers.add(ldapURI); } - conf.setProperty("config.LdapServers", StringUtils.join(ldapServers, ",")); + conf.setProperty("config.LdapServers", StringUtils.join(ldapServers, ";")); } } catch (Exception ex) { throw new RuntimeException(ex); -- To view, visit http://gerrit.ovirt.org/28970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5da2f60b889febb6fba7d8a06a1830f573802106 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
