diff options
| author | Michal Zidek <mzidek@redhat.com> | 2014-09-29 17:17:59 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-10-16 18:14:55 +0200 |
| commit | f834f712548db811695ea0fd6d6b31d3bd03e2a3 (patch) | |
| tree | 284350a28045be3bf9afc7358be877b725854ec5 | |
| parent | 06424c5ac5ffb871476208155762bb5b73e0b665 (diff) | |
| download | sssd-f834f712548db811695ea0fd6d6b31d3bd03e2a3.tar.gz sssd-f834f712548db811695ea0fd6d6b31d3bd03e2a3.tar.xz sssd-f834f712548db811695ea0fd6d6b31d3bd03e2a3.zip | |
LDAP: Change defaults for ldap_user/group_objectsid
Fixes:
https://fedorahosted.org/sssd/ticket/2361
Reviewed-by: Pavel Reichl <preichl@redhat.com>
| -rw-r--r-- | src/man/sssd-ldap.5.xml | 4 | ||||
| -rw-r--r-- | src/providers/ldap/ldap_opts.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index 03ea7948b..a21ffc129 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -346,7 +346,7 @@ necessary for ActiveDirectory servers. </para> <para> - Default: objectSid for ActiveDirectory, not set + Default: ipaNTSecurityIdentifier for IPA, objectSID for other servers. </para> </listitem> @@ -854,7 +854,7 @@ necessary for ActiveDirectory servers. </para> <para> - Default: objectSid for ActiveDirectory, not set + Default: ipaNTSecurityIdentifier for IPA, objectSID for other servers. </para> </listitem> diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h index 0a33289f2..61e3309fe 100644 --- a/src/providers/ldap/ldap_opts.h +++ b/src/providers/ldap/ldap_opts.h @@ -155,7 +155,7 @@ struct sdap_attr_map rfc2307_user_map[] = { { "ldap_user_principal", "krbPrincipalName", SYSDB_UPN, NULL }, { "ldap_user_fullname", "cn", SYSDB_FULLNAME, NULL }, { "ldap_user_member_of", NULL, SYSDB_MEMBEROF, NULL }, - { "ldap_user_objectsid", NULL, SYSDB_SID, NULL }, + { "ldap_user_objectsid", "objectSID", SYSDB_SID, NULL }, { "ldap_user_primary_group", NULL, SYSDB_PRIMARY_GROUP, NULL }, { "ldap_user_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_user_entry_usn", NULL, SYSDB_USN, NULL }, @@ -188,7 +188,7 @@ struct sdap_attr_map rfc2307_group_map[] = { { "ldap_group_pwd", "userPassword", SYSDB_PWD, NULL }, { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "memberuid", SYSDB_MEMBER, NULL }, - { "ldap_group_objectsid", NULL, SYSDB_SID, NULL }, + { "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL }, { "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_group_entry_usn", NULL, SYSDB_USN, NULL }, { "ldap_group_type", NULL, SYSDB_GROUP_TYPE, NULL }, @@ -207,7 +207,7 @@ struct sdap_attr_map rfc2307bis_user_map[] = { { "ldap_user_principal", "krbPrincipalName", SYSDB_UPN, NULL }, { "ldap_user_fullname", "cn", SYSDB_FULLNAME, NULL }, { "ldap_user_member_of", "memberOf", SYSDB_MEMBEROF, NULL }, - { "ldap_user_objectsid", NULL, SYSDB_SID, NULL }, + { "ldap_user_objectsid", "objectSID", SYSDB_SID, NULL }, { "ldap_user_primary_group", NULL, SYSDB_PRIMARY_GROUP, NULL }, { "ldap_user_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_user_entry_usn", NULL, SYSDB_USN, NULL }, @@ -240,7 +240,7 @@ struct sdap_attr_map rfc2307bis_group_map[] = { { "ldap_group_pwd", "userPassword", SYSDB_PWD, NULL }, { "ldap_group_gid_number", "gidNumber", SYSDB_GIDNUM, NULL }, { "ldap_group_member", "member", SYSDB_MEMBER, NULL }, - { "ldap_group_objectsid", NULL, SYSDB_SID, NULL }, + { "ldap_group_objectsid", "objectSID", SYSDB_SID, NULL }, { "ldap_group_modify_timestamp", "modifyTimestamp", SYSDB_ORIG_MODSTAMP, NULL }, { "ldap_group_entry_usn", NULL, SYSDB_USN, NULL }, { "ldap_group_type", NULL, SYSDB_GROUP_TYPE, NULL }, |