Yair Zaslavsky has uploaded a new change for review. Change subject: core: fix useDnsLookup behavior ......................................................................
core: fix useDnsLookup behavior This patch fixes the usage of "useDnsLookup" flag at engine-manage-domains configuration. only When --ldap-servers is used, this flag should be ignored if set to true. Change-Id: Ic96e2f9fafcac1e6ba952a198bfb9cecc160ba8b Bug-Url: https://bugzilla.redhat.com/1063286 Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/24306/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java index 2dafac6..5a499c7 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java @@ -18,6 +18,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -79,6 +80,7 @@ private boolean reportAllErrors; private boolean addPermissions; private boolean useDnsLookup; + private boolean ldapServers; private final static Logger log = Logger.getLogger(ManageDomains.class); private static final String DEFAULT_LDAP_SERVER_PORT = "389"; @@ -194,6 +196,10 @@ } if (parser.hasArg(Arguments.addPermissions.name())) { util.addPermissions = true; + } + + if (parser.hasArg(Arguments.ldapServers.name())) { + util.ldapServers = true; } try { @@ -699,6 +705,12 @@ try { log.info("Creating kerberos configuration for domain(s): " + gssapiDomainsString); useDnsLookup = utilityConfiguration.getUseDnsLookup(); + if (!ldapServers && useDnsLookup) { + // The arguments do not contain a list of ldap servers, the 725 + // kerberos configuration should not be created according to it if 726 + // useDnsLookup is set to true as in this case the kdc and the domain_realm info + ldapServersPerGSSAPIDomains = Collections.emptyMap(); + } krbConfCreator = new KrbConfCreator(gssapiDomainsString, useDnsLookup, ldapServersPerGSSAPIDomains); StringBuffer buffer = null; buffer = krbConfCreator.parse("y"); -- To view, visit http://gerrit.ovirt.org/24306 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic96e2f9fafcac1e6ba952a198bfb9cecc160ba8b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
