summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2014-08-27 17:14:07 +0200
committerJakub Hrozek <jhrozek@redhat.com>2014-10-14 11:36:45 +0200
commit6c3e3b0c05ee4bb5ecede4312946de360f3855f5 (patch)
tree9bebf7f509cabc48079656ad95ff5ce58c46e122
parent756a944b898e55a83c212999b31ba6550af4b1ce (diff)
downloadsssd-6c3e3b0c05ee4bb5ecede4312946de360f3855f5.tar.gz
sssd-6c3e3b0c05ee4bb5ecede4312946de360f3855f5.tar.xz
sssd-6c3e3b0c05ee4bb5ecede4312946de360f3855f5.zip
LDAP: Add Windows Server 2012 R2 functional level
https://fedorahosted.org/sssd/ticket/2418 According to http://msdn.microsoft.com/en-us/library/cc223272.aspx a Windows Server 2012 R2 has a functional level set to '6'. We need to support that value in order for tokenGroups to be functional. For more information on the functional levels, please refer to: http://technet.microsoft.com/en-us/library/understanding-active-directory-functional-levels%28v=ws.10%29.aspx Reviewed-by: Pavel Březina <pbrezina@redhat.com> (cherry picked from commit 9ea0969f6a9e52b7c57feb5808266b0739ee40a4)
-rw-r--r--src/providers/ldap/sdap.c1
-rw-r--r--src/providers/ldap/sdap.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c
index ddcf199b6..900136cfc 100644
--- a/src/providers/ldap/sdap.c
+++ b/src/providers/ldap/sdap.c
@@ -1016,6 +1016,7 @@ int sdap_get_server_opts_from_rootdse(TALLOC_CTX *memctx,
case DS_BEHAVIOR_WIN2008:
case DS_BEHAVIOR_WIN2008R2:
case DS_BEHAVIOR_WIN2012:
+ case DS_BEHAVIOR_WIN2012R2:
opts->dc_functional_level = dc_level;
DEBUG(SSSDBG_CONF_SETTINGS,
("Setting AD compatibility level to [%d]\n",
diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
index f3f13e9c7..ad6bdb5c9 100644
--- a/src/providers/ldap/sdap.h
+++ b/src/providers/ldap/sdap.h
@@ -375,7 +375,8 @@ enum dc_functional_level {
DS_BEHAVIOR_WIN2003 = 2,
DS_BEHAVIOR_WIN2008 = 3,
DS_BEHAVIOR_WIN2008R2 = 4,
- DS_BEHAVIOR_WIN2012 = 5
+ DS_BEHAVIOR_WIN2012 = 5,
+ DS_BEHAVIOR_WIN2012R2 = 6
};
struct sdap_domain {