Alon Bar-Lev has uploaded a new change for review. Change subject: aaa: Changing RootDSE parsing for IPA to include defaultNamingContext ......................................................................
aaa: Changing RootDSE parsing for IPA to include defaultNamingContext As written in the bug, both freeIPA 3 and 4 have defaultNamingContext Change-Id: Iaba699c5cc40adcac793155724be7cbdfe3254df Topic: AAA Bug-Url: https://bugzilla.redhat.com/1171395 Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSE.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEAttributes.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEContextMapper.java 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/36140/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSE.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSE.java index eeb60f6..fdde6da 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSE.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSE.java @@ -10,7 +10,7 @@ private String defaultNamingContext; public IPARootDSE(Attributes rootDseRecords) throws NamingException { - Attribute namingContexts = rootDseRecords.get(IPARootDSEAttributes.namingContexts.name()); + Attribute namingContexts = rootDseRecords.get(IPARootDSEAttributes.defaultnamingcontext.name()); if ( namingContexts != null ) { this.defaultNamingContext = namingContexts.get(0).toString(); } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEAttributes.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEAttributes.java index 9dbbcc9..9c68e2e 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEAttributes.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEAttributes.java @@ -1,6 +1,6 @@ package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; public enum IPARootDSEAttributes { - namingContexts, + defaultnamingcontext, vendorName } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEContextMapper.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEContextMapper.java index 7f9b78d..9d3cd69 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEContextMapper.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/IPARootDSEContextMapper.java @@ -1,6 +1,6 @@ package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; -import static org.ovirt.engine.extensions.aaa.builtin.kerberosldap.IPARootDSEAttributes.namingContexts; +import static org.ovirt.engine.extensions.aaa.builtin.kerberosldap.IPARootDSEAttributes.defaultnamingcontext; import javax.naming.NamingException; import javax.naming.directory.Attribute; @@ -11,7 +11,7 @@ public class IPARootDSEContextMapper implements ContextMapper { - static final String[] ROOTDSE_ATTRIBUTE_FILTER = { namingContexts.name() }; + static final String[] ROOTDSE_ATTRIBUTE_FILTER = { defaultnamingcontext.name() }; @Override public Object mapFromContext(Object ctx) { @@ -23,7 +23,7 @@ return null; } - Attribute att = attributes.get(namingContexts.name()); + Attribute att = attributes.get(defaultnamingcontext.name()); if (att != null) { try { -- To view, visit http://gerrit.ovirt.org/36140 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaba699c5cc40adcac793155724be7cbdfe3254df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzasl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
