Author: gd Date: 2006-06-09 13:04:47 +0000 (Fri, 09 Jun 2006) New Revision: 16122
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16122 Log: As we use 'inetOrgPerson' as structural objectclass for new accounts for eDir, we already add 'sn' as required attribute on LDAP add operations. When we modify an entry, we need to request 'sn' as well in our attribute lists, so that we don't try to add it a second time. Guenther Modified: branches/SAMBA_3_0/source/include/smbldap.h branches/SAMBA_3_0/source/lib/smbldap.c trunk/source/include/smbldap.h trunk/source/lib/smbldap.c Changeset: Modified: branches/SAMBA_3_0/source/include/smbldap.h =================================================================== --- branches/SAMBA_3_0/source/include/smbldap.h 2006-06-09 12:55:07 UTC (rev 16121) +++ branches/SAMBA_3_0/source/include/smbldap.h 2006-06-09 13:04:47 UTC (rev 16122) @@ -101,6 +101,7 @@ #define LDAP_ATTR_MOD_TIMESTAMP 41 #define LDAP_ATTR_LOGON_HOURS 42 #define LDAP_ATTR_TRUST_PASSWD_FLAGS 43 +#define LDAP_ATTR_SN 44 typedef struct _attrib_map_entry { Modified: branches/SAMBA_3_0/source/lib/smbldap.c =================================================================== --- branches/SAMBA_3_0/source/lib/smbldap.c 2006-06-09 12:55:07 UTC (rev 16121) +++ branches/SAMBA_3_0/source/lib/smbldap.c 2006-06-09 13:04:47 UTC (rev 16122) @@ -52,6 +52,7 @@ { LDAP_ATTR_LOGOFF_TIME, "logoffTime" }, { LDAP_ATTR_KICKOFF_TIME, "kickoffTime" }, { LDAP_ATTR_CN, "cn" }, + { LDAP_ATTR_SN, "sn" }, { LDAP_ATTR_DISPLAY_NAME, "displayName" }, { LDAP_ATTR_HOME_PATH, "smbHome" }, { LDAP_ATTR_HOME_DRIVE, "homeDrive" }, @@ -106,6 +107,7 @@ { LDAP_ATTR_LOGOFF_TIME, "sambaLogoffTime" }, { LDAP_ATTR_KICKOFF_TIME, "sambaKickoffTime" }, { LDAP_ATTR_CN, "cn" }, + { LDAP_ATTR_SN, "sn" }, { LDAP_ATTR_DISPLAY_NAME, "displayName" }, { LDAP_ATTR_HOME_DRIVE, "sambaHomeDrive" }, { LDAP_ATTR_HOME_PATH, "sambaHomePath" }, Modified: trunk/source/include/smbldap.h =================================================================== --- trunk/source/include/smbldap.h 2006-06-09 12:55:07 UTC (rev 16121) +++ trunk/source/include/smbldap.h 2006-06-09 13:04:47 UTC (rev 16122) @@ -101,6 +101,7 @@ #define LDAP_ATTR_MOD_TIMESTAMP 41 #define LDAP_ATTR_LOGON_HOURS 42 #define LDAP_ATTR_TRUST_PASSWD_FLAGS 43 +#define LDAP_ATTR_SN 44 typedef struct _attrib_map_entry { Modified: trunk/source/lib/smbldap.c =================================================================== --- trunk/source/lib/smbldap.c 2006-06-09 12:55:07 UTC (rev 16121) +++ trunk/source/lib/smbldap.c 2006-06-09 13:04:47 UTC (rev 16122) @@ -52,6 +52,7 @@ { LDAP_ATTR_LOGOFF_TIME, "logoffTime" }, { LDAP_ATTR_KICKOFF_TIME, "kickoffTime" }, { LDAP_ATTR_CN, "cn" }, + { LDAP_ATTR_SN, "sn" }, { LDAP_ATTR_DISPLAY_NAME, "displayName" }, { LDAP_ATTR_HOME_PATH, "smbHome" }, { LDAP_ATTR_HOME_DRIVE, "homeDrive" }, @@ -106,6 +107,7 @@ { LDAP_ATTR_LOGOFF_TIME, "sambaLogoffTime" }, { LDAP_ATTR_KICKOFF_TIME, "sambaKickoffTime" }, { LDAP_ATTR_CN, "cn" }, + { LDAP_ATTR_SN, "sn" }, { LDAP_ATTR_DISPLAY_NAME, "displayName" }, { LDAP_ATTR_HOME_DRIVE, "sambaHomeDrive" }, { LDAP_ATTR_HOME_PATH, "sambaHomePath" },
