Merge pull request #127 from jvlcek/bz1424618_dup_users

Add support for the domain user attribute (cherry picked from commit 5577745) https://bugzilla.redhat.com/show_bug.cgi?id=1487689
ManageIQ · Sep 5, 2017 · b71bc0c · b71bc0c
1 parent f0414e2
commit b71bc0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/TEMPLATE/etc/httpd/conf.d/manageiq-external-auth.conf.erb b/TEMPLATE/etc/httpd/conf.d/manageiq-external-auth.conf.erb
@@ -29,6 +29,7 @@ LoadModule auth_kerb_module modules/mod_auth_kerb.so
   LookupUserAttr givenname   REMOTE_USER_FIRSTNAME
   LookupUserAttr sn          REMOTE_USER_LASTNAME
   LookupUserAttr displayname REMOTE_USER_FULLNAME
+  LookupUserAttr domainname  REMOTE_USER_DOMAIN
 
   LookupUserGroups           REMOTE_USER_GROUPS ":"
   LookupDbusTimeout          5000
@@ -57,6 +58,7 @@ LoadModule auth_kerb_module modules/mod_auth_kerb.so
   LookupUserAttr givenname   REMOTE_USER_FIRSTNAME
   LookupUserAttr sn          REMOTE_USER_LASTNAME
   LookupUserAttr displayname REMOTE_USER_FULLNAME
+  LookupUserAttr domainname  REMOTE_USER_DOMAIN
 
   LookupUserGroups           REMOTE_USER_GROUPS ":"
   LookupDbusTimeout          5000

diff --git a/TEMPLATE/etc/httpd/conf.d/manageiq-remote-user.conf b/TEMPLATE/etc/httpd/conf.d/manageiq-remote-user.conf
@@ -7,3 +7,5 @@ RequestHeader set X_REMOTE_USER_FIRSTNAME %{REMOTE_USER_FIRSTNAME}e env=REMOTE_U
 RequestHeader set X_REMOTE_USER_LASTNAME  %{REMOTE_USER_LASTNAME}e  env=REMOTE_USER_LASTNAME
 RequestHeader set X_REMOTE_USER_FULLNAME  %{REMOTE_USER_FULLNAME}e  env=REMOTE_USER_FULLNAME
 RequestHeader set X_REMOTE_USER_GROUPS    %{REMOTE_USER_GROUPS}e    env=REMOTE_USER_GROUPS
+RequestHeader set X_REMOTE_USER_DOMAIN    %{REMOTE_USER_DOMAIN}e    env=REMOTE_USER_DOMAIN
+