summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-06-09 13:04:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:21 -0500
commit38060f70a561ee9b71038bf5909b6fdf4872c4c4 (patch)
tree59440ae6844e5f92b595254f0302d419015383f9 /source3
parentd28456fe2250dd5a6d28d38ffd0aee9197c1b4ba (diff)
downloadsamba-38060f70a561ee9b71038bf5909b6fdf4872c4c4.tar.gz
samba-38060f70a561ee9b71038bf5909b6fdf4872c4c4.tar.bz2
samba-38060f70a561ee9b71038bf5909b6fdf4872c4c4.zip
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)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/smbldap.h1
-rw-r--r--source3/lib/smbldap.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index 6cfde13f4a..ae54e66b36 100644
--- 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 dfa6782afe..5b18f4e311 100644
--- 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" },