diff options
| author | David Boreham <dboreham@redhat.com> | 2005-04-27 16:16:03 +0000 |
|---|---|---|
| committer | David Boreham <dboreham@redhat.com> | 2005-04-27 16:16:03 +0000 |
| commit | 474810959a403f00b4249ce4281d78a152af4b20 (patch) | |
| tree | fdbf6348ebc3c171b980624afc3ee1fe6c97d416 /ldap/servers/plugins/replication/windows_protocol_util.c | |
| parent | 3bbb813a6dccbe081c512daa62495276faace6c1 (diff) | |
| download | ds-474810959a403f00b4249ce4281d78a152af4b20.tar.gz ds-474810959a403f00b4249ce4281d78a152af4b20.tar.xz ds-474810959a403f00b4249ce4281d78a152af4b20.zip | |
Fix mapping of street attribute, fix total update of previously sync'ed entries
Diffstat (limited to 'ldap/servers/plugins/replication/windows_protocol_util.c')
| -rw-r--r-- | ldap/servers/plugins/replication/windows_protocol_util.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c index 3e5cca49..b15c60fe 100644 --- a/ldap/servers/plugins/replication/windows_protocol_util.c +++ b/ldap/servers/plugins/replication/windows_protocol_util.c @@ -192,7 +192,9 @@ static windows_attribute_map user_attribute_map[] = { "logonHours", "ntUserLogonHours", bidirectional, always, normal}, { "maxStorage", "ntUserMaxStorage", bidirectional, always, normal}, { "profilePath", "ntUserProfile", bidirectional, always, normal}, - { "streetAddress", "street", bidirectional, always, normal}, + /* IETF schema has 'street' and 'streetaddress' as aliases, but Microsoft does not */ + { "street", "street", fromwindowsonly, always, normal}, + { "streetAddress", "street", towindowsonly, always, normal}, { "userParameters", "ntUserParms", bidirectional, always, normal}, { "userWorkstations", "ntUserWorkstations", bidirectional, always, normal}, { "sAMAccountName", "ntUserDomainId", bidirectional, createonly, normal}, @@ -208,8 +210,10 @@ static windows_attribute_map user_attribute_map[] = static windows_attribute_map group_attribute_map[] = { { "groupType", "ntGroupType", bidirectional, createonly, normal}, - { "sAMAccountName", "ntUserDomainId", bidirectional, createonly, normal}, - { "streetAddress", "street", bidirectional, always, normal}, + { "sAMAccountName", "ntUserDomainId", bidirectional, always, normal}, + /* IETF schema has 'street' and 'streetaddress' as aliases, but Microsoft does not */ + { "street", "street", fromwindowsonly, always, normal}, + { "streetAddress", "street", towindowsonly, always, normal}, { "member", "uniquemember", bidirectional, always, dnmap}, {NULL, NULL, -1} }; @@ -2552,7 +2556,7 @@ int windows_process_total_entry(Private_Repl_Protocol *prp,Slapi_Entry *e) agmt_get_long_name(prp->agmt), slapi_sdn_get_dn(slapi_entry_get_sdn_const(e)), is_ours ? "ours" : "not ours"); if (is_ours) { - retval = map_entry_dn_outbound(e,&remote_dn,prp,&missing_entry,1 /* want GUID */); + retval = map_entry_dn_outbound(e,&remote_dn,prp,&missing_entry,0 /* we don't want the GUID */); if (retval || NULL == remote_dn) { slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, |