ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-8874. ADKerberosOperationHandler should not set objectcategory attribute. (dilli Arumugam via jaimin)
Date Mon, 05 Jan 2015 22:54:33 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 3af7a8353 -> 016604db0


AMBARI-8874. ADKerberosOperationHandler should not set objectcategory attribute. (dilli Arumugam
via jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/016604db
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/016604db
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/016604db

Branch: refs/heads/trunk
Commit: 016604db04fffb68cc9416117a9fab907baf8b7b
Parents: 3af7a83
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Mon Jan 5 14:54:28 2015 -0800
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Mon Jan 5 14:54:28 2015 -0800

----------------------------------------------------------------------
 .../serveraction/kerberos/ADKerberosOperationHandler.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/016604db/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
index d963c1b..a8eed2b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandler.java
@@ -247,13 +247,9 @@ public class ADKerberosOperationHandler extends KerberosOperationHandler
{
     attributes.put(upn);
 
     Attribute spn = new BasicAttribute("servicePrincipalName");
-    spn.add(principal + "@" + realm.toUpperCase());
+    spn.add(principal);
     attributes.put(spn);
 
-    Attribute obcat = new BasicAttribute("objectCategory");  // objectCategory
-    obcat.add("CN=Person,CN=Schema,CN=Configuration," + realmToDcs(realm));
-    attributes.put(obcat);
-
     Attribute uac = new BasicAttribute("userAccountControl");  // userAccountControl
     uac.add("512");
     attributes.put(uac);
@@ -355,12 +351,12 @@ public class ADKerberosOperationHandler extends KerberosOperationHandler
{
     // is not issued by trusted authority. This is typical with self signed certificated
in
     // development environment
     System.setProperty("javax.net.ssl.trustStore",
-      "/Users/darumugam/workspace/ambari/apache-ambari-rd/cacerts");
+      "/tmp/workspace/ambari/apache-ambari-rd/cacerts");
 
     ADKerberosOperationHandler handler = new ADKerberosOperationHandler();
 
     KerberosCredential kc = new KerberosCredential(
-      "Administrator@knox.com", "hadUp2Argus", null);  // null keytab
+      "Administrator@knox.com", "hadoop", null);  // null keytab
 
     handler.open(kc, "KNOX.COM",
       "ldaps://dillwin12.knox.com:636", "ou=service accounts,dc=knox,dc=com");


Mime
View raw message