ldap: Fixed supplementary group memberships for CentOS 7.
This commit is contained in:
parent
e948ce5cfd
commit
6bf17c7385
2 changed files with 28 additions and 4 deletions
|
@ -78,6 +78,30 @@ class ldap::auth(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case $::operatingsystem {
|
||||||
|
"centos","redhat": {
|
||||||
|
if versioncmp($::operatingsystemrelease, "7") < 0 {
|
||||||
|
$member_attr = "uniqueMember"
|
||||||
|
} else {
|
||||||
|
$member_attr = "member"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"fedora": {
|
||||||
|
if versioncmp($::operatingsystemrelease, "18") < 0 {
|
||||||
|
$member_attr = "uniqueMember"
|
||||||
|
} else {
|
||||||
|
$member_attr = "member"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"ubuntu": {
|
||||||
|
if versioncmp($::operatingsystemrelease, "12.04") < 0 {
|
||||||
|
$member_attr = "uniqueMember"
|
||||||
|
} else {
|
||||||
|
$member_attr = "member"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if $::kernel == "Linux" {
|
if $::kernel == "Linux" {
|
||||||
include nscd
|
include nscd
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,13 +21,13 @@ map passwd gecos displayName
|
||||||
map passwd loginShell "${loginShell:-/bin/bash}"
|
map passwd loginShell "${loginShell:-/bin/bash}"
|
||||||
map passwd homeDirectory "${unixHomeDirectory:-/home/$sAMAccountName}"
|
map passwd homeDirectory "${unixHomeDirectory:-/home/$sAMAccountName}"
|
||||||
filter group (&(objectClass=group)(gidNumber=*))
|
filter group (&(objectClass=group)(gidNumber=*))
|
||||||
<% if @operatingsystem == "CentOS" or (@operatingsystem == "Ubuntu" and scope.function_versioncmp([@operatingsystemrelease, '12.04']) < 0) -%>
|
<% if @member_attr != "member" -%>
|
||||||
map group uniqueMember member
|
map group <%= @member_attr %> member
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% else -%>
|
<% else -%>
|
||||||
pagesize 500
|
pagesize 500
|
||||||
<% if @operatingsystem != "CentOS" and (@operatingsystem == "Ubuntu" and scope.function_versioncmp([@operatingsystemrelease, '12.04']) >= 0) -%>
|
<% if @member_attr != "uniqueMember" -%>
|
||||||
map group member uniqueMember
|
map group <%= @member_attr %> uniqueMember
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% if @auth == 'bind' -%>
|
<% if @auth == 'bind' -%>
|
||||||
|
|
Loading…
Add table
Reference in a new issue