From: Simo Sorce <idra@samba.org>
Date: Mon, 11 Jun 2007 00:05:48 +0000 (+0000)
Subject: r23411: We were missing displayName and that was preventing us
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~233
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6399f1aa1c98d2d6e700245bb95c84f7e173236;p=thirdparty%2Fsamba.git

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.
---

diff --git a/source/lib/smbldap.c b/source/lib/smbldap.c
index cffc9389d7d..f8cb8f4a25d 100644
--- a/source/lib/smbldap.c
+++ b/source/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"	},