r16122: 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
(This used to be commit e018ea3d1d70e68e6802843f88b3245dc09244c9)

diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index 6cfde13f4a9df19a9aaefea0784886c19b6bbccd..ae54e66b369e33841bcd02ba1d2d9ad725cd28f8 100644 (file)
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -101,6 +101,7 @@ struct smbldap_state;
 #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 {

diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index dfa6782afef2cd4e53f669710914ea1d3a147260..5b18f4e31137990075edde832b98f8bba7ab1e5f 100644 (file)
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -52,6 +52,7 @@ ATTRIB_MAP_ENTRY attrib_map_v22[] = {
        { 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 @@ ATTRIB_MAP_ENTRY attrib_map_v30[] = {
        { 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"         },