r23411: We were missing displayName and that was preventing us

from successfully deleting an entry when "account" is
the STRUCTURAL objectclass used for users and machines.
"account" is used each time the user entry is in /etc/passwd
and we have only the samba attributes in ldap, as well
as for rfc2307(bis) standard based directories.
(This used to be commit e6399f1aa1c98d2d6e700245bb95c84f7e173236)

diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index cffc9389d7da3c13b84acbe1558ab9aa4da3b7f0..f8cb8f4a25d798ac06c6aa0e5e51fea21b4b0b23 100644 (file)
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -138,6 +138,7 @@ ATTRIB_MAP_ENTRY attrib_map_to_delete_v30[] = {
        { LDAP_ATTR_LOGON_TIME,         "sambaLogonTime"        },
        { LDAP_ATTR_LOGOFF_TIME,        "sambaLogoffTime"       },
        { LDAP_ATTR_KICKOFF_TIME,       "sambaKickoffTime"      },
+       { LDAP_ATTR_DISPLAY_NAME,       "displayName"           },
        { LDAP_ATTR_HOME_DRIVE,         "sambaHomeDrive"        },
        { LDAP_ATTR_HOME_PATH,          "sambaHomePath"         },
        { LDAP_ATTR_LOGON_SCRIPT,       "sambaLogonScript"      },