summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2007-06-11 00:05:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:15 -0500
commitc99449016b2ccd0c9f35e3867a96ed3500d2f064 (patch)
tree7297a5817aae63fa02b12b8724410165501bf27b
parentde565785f5e1f097bd75f57331425c4185185f80 (diff)
downloadsamba-c99449016b2ccd0c9f35e3867a96ed3500d2f064.tar.gz
samba-c99449016b2ccd0c9f35e3867a96ed3500d2f064.tar.bz2
samba-c99449016b2ccd0c9f35e3867a96ed3500d2f064.zip
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)
-rw-r--r--source3/lib/smbldap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index cffc9389d7..f8cb8f4a25 100644
--- 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" },