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/1062172 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/24190/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 e6e9bd7..d01dbd0 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 @@ -20,6 +20,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; @@ -82,6 +83,7 @@ private boolean addPermissions; private boolean useDnsLookup; private boolean changePasswordMsg; + private boolean ldapServers; private final static Logger log = Logger.getLogger(ManageDomains.class); private static final String DEFAULT_LDAP_SERVER_PORT = "389"; @@ -201,6 +203,10 @@ } if (parser.hasArg(Arguments.changePasswordMsg.name())) { util.changePasswordMsg = true; + } + + if (parser.hasArg(Arguments.ldapServers.name())) { + util.ldapServers = true; } try { @@ -761,7 +767,11 @@ try { log.info("Creating kerberos configuration for domain(s): " + gssapiDomainsString); useDnsLookup = utilityConfiguration.getUseDnsLookup(); - krbConfCreator = new KrbConfCreator(gssapiDomainsString, useDnsLookup, ldapServersPerGSSAPIDomains); + if (ldapServers) { + krbConfCreator = new KrbConfCreator(gssapiDomainsString, useDnsLookup, ldapServersPerGSSAPIDomains); + } else { + krbConfCreator = new KrbConfCreator(gssapiDomainsString, useDnsLookup, Collections.EMPTY_MAP); + } StringBuffer buffer = null; buffer = krbConfCreator.parse("y"); krbConfCreator.toFile(utilityConfiguration.getkrb5confFilePath() + TESTING_KRB5_CONF_SUFFIX, buffer); -- To view, visit http://gerrit.ovirt.org/24190 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.4 Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
