You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by di...@apache.org on 2014/01/06 23:44:09 UTC

git commit: KNOX-239: ldif template files for ldapgroups should use consistent naming attribute for user and group membe

Updated Branches:
  refs/heads/master eaf6a0806 -> 5735acfb1


KNOX-239: ldif template files for ldapgroups should use consistent naming attribute for user and group membe


Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/5735acfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/5735acfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/5735acfb

Branch: refs/heads/master
Commit: 5735acfb19c446558b6c2f8d3359f6704bda7f19
Parents: eaf6a08
Author: Dilli Dorai Arumugam <da...@hortonworks.com>
Authored: Mon Jan 6 14:42:49 2014 -0800
Committer: Dilli Dorai Arumugam <da...@hortonworks.com>
Committed: Mon Jan 6 14:42:49 2014 -0800

----------------------------------------------------------------------
 gateway-release/home/templates/sandbox.knoxrealm1.xml | 2 +-
 gateway-release/home/templates/sandbox.knoxrealm2.xml | 2 +-
 gateway-release/home/templates/users.ldapgroups.ldif  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/5735acfb/gateway-release/home/templates/sandbox.knoxrealm1.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/sandbox.knoxrealm1.xml b/gateway-release/home/templates/sandbox.knoxrealm1.xml
index 51fb555..19bc0b6 100644
--- a/gateway-release/home/templates/sandbox.knoxrealm1.xml
+++ b/gateway-release/home/templates/sandbox.knoxrealm1.xml
@@ -94,7 +94,7 @@
             -->
             <param>
               <name>main.ldapRealm.memberAttributeValueTemplate</name>
-              <value>cn={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
+              <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>
             <param>
               <name>main.ldapRealm.contextFactory.systemUsername</name>

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/5735acfb/gateway-release/home/templates/sandbox.knoxrealm2.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/sandbox.knoxrealm2.xml b/gateway-release/home/templates/sandbox.knoxrealm2.xml
index 448691f..95c1e3b 100644
--- a/gateway-release/home/templates/sandbox.knoxrealm2.xml
+++ b/gateway-release/home/templates/sandbox.knoxrealm2.xml
@@ -124,7 +124,7 @@
             -->
             <param>
               <name>main.ldapGroupRealm.memberAttributeValueTemplate</name>
-              <value>cn={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
+              <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
             </param>
             <param>
               <name>main.ldapGroupRealm.contextFactory.systemUsername</name>

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/5735acfb/gateway-release/home/templates/users.ldapgroups.ldif
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/users.ldapgroups.ldif b/gateway-release/home/templates/users.ldapgroups.ldif
index f10851a..80fddc0 100644
--- a/gateway-release/home/templates/users.ldapgroups.ldif
+++ b/gateway-release/home/templates/users.ldapgroups.ldif
@@ -80,8 +80,8 @@ objectclass:top
 objectclass: groupofnames
 cn: analyst
 description:analyst  group
-member: cn=sam,ou=people,dc=hadoop,dc=apache,dc=org
-member: cn=tom,ou=people,dc=hadoop,dc=apache,dc=org
+member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
+member: uid=tom,ou=people,dc=hadoop,dc=apache,dc=org
 
 
 # create the scientist group under groups
@@ -90,5 +90,5 @@ objectclass:top
 objectclass: groupofnames
 cn: scientist
 description: scientist group
-member: cn=sam,ou=people,dc=hadoop,dc=apache,dc=org
+member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org