From 5019d21666a5c6b3b8465de5ee92569b1c8b6f91 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Apr 06 2020 10:14:14 +0000 Subject: ldap: set ldap_group_name to sAMAccountName for ad schema This is to make it consistent with the AD provider which was changed in adb148603344a42d6edffdda0786a10af715dacb. "name" is an optional field for the group class. Reviewed-by: Pavel Březina --- diff --git a/src/providers/ldap/ldap_opts.c b/src/providers/ldap/ldap_opts.c index 70e5d25..8361bf3 100644 --- a/src/providers/ldap/ldap_opts.c +++ b/src/providers/ldap/ldap_opts.c @@ -311,7 +311,7 @@ struct sdap_attr_map gen_ad2008r2_user_map[] = { struct sdap_attr_map gen_ad2008r2_group_map[] = { { "ldap_group_object_class", "group", SYSDB_GROUP_CLASS, NULL }, { "ldap_group_object_class_alt", NULL, SYSDB_GROUP_CLASS, NULL }, - { "ldap_group_name", "name", SYSDB_NAME, NULL }, + { "ldap_group_name", "sAMAccountName", SYSDB_NAME, NULL }, { "ldap_group_pwd", NULL, SYSDB_PWD, NULL }, { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "member", SYSDB_MEMBER, NULL }, diff --git a/src/tests/intg/data/ad_schema.ldif b/src/tests/intg/data/ad_schema.ldif index 1e4b777..6ae533a 100644 --- a/src/tests/intg/data/ad_schema.ldif +++ b/src/tests/intg/data/ad_schema.ldif @@ -3,7 +3,7 @@ objectClass: olcSchemaConfig cn: ad structuralObjectClass: olcSchemaConfig olcAttributeTypes: {0}( 1.2.840.113556.1.4.750 NAME 'groupType' SYNTAX '1.3.6.1.4.1.1466.115.121.1.27' SINGLE-VALUE ) -olcAttributeTypes: {1}( 1.2.840.113556.1.4.221 NAME 'sAMAccountName' EQUALITY caseExactMatch SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE ) +olcAttributeTypes: {1}( 1.2.840.113556.1.4.221 NAME 'sAMAccountName' EQUALITY caseIgnoreMatch SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE ) olcAttributeTypes: {2}( 1.2.840.113556.1.4.35 NAME 'employeeID' EQUALITY integerMatch SYNTAX '1.3.6.1.4.1.1466.115.121.1.27' SINGLE-VALUE ) olcAttributeTypes: {3}( 1.2.840.113556.1.2.1 NAME 'instanceType' EQUALITY integerMatch SYNTAX '1.3.6.1.4.1.1466.115.121.1.27' SINGLE-VALUE ) olcAttributeTypes: {4}( 1.2.840.113556.1.4.782 NAME 'objectCategory' EQUALITY caseExactMatch SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE )