Author: idra Date: 2007-06-11 00:05:48 +0000 (Mon, 11 Jun 2007) New Revision: 23411
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23411 Log: 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. Modified: branches/SAMBA_3_0/source/lib/smbldap.c branches/SAMBA_3_0_25/source/lib/smbldap.c branches/SAMBA_3_0_26/source/lib/smbldap.c Changeset: Modified: branches/SAMBA_3_0/source/lib/smbldap.c =================================================================== --- branches/SAMBA_3_0/source/lib/smbldap.c 2007-06-10 17:02:09 UTC (rev 23410) +++ branches/SAMBA_3_0/source/lib/smbldap.c 2007-06-11 00:05:48 UTC (rev 23411) @@ -138,6 +138,7 @@ { 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" }, Modified: branches/SAMBA_3_0_25/source/lib/smbldap.c =================================================================== --- branches/SAMBA_3_0_25/source/lib/smbldap.c 2007-06-10 17:02:09 UTC (rev 23410) +++ branches/SAMBA_3_0_25/source/lib/smbldap.c 2007-06-11 00:05:48 UTC (rev 23411) @@ -138,6 +138,7 @@ { 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" }, Modified: branches/SAMBA_3_0_26/source/lib/smbldap.c =================================================================== --- branches/SAMBA_3_0_26/source/lib/smbldap.c 2007-06-10 17:02:09 UTC (rev 23410) +++ branches/SAMBA_3_0_26/source/lib/smbldap.c 2007-06-11 00:05:48 UTC (rev 23411) @@ -138,6 +138,7 @@ { 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" },
