summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2004-04-05 14:45:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:06 -0500
commit5ebcb9081e435d54c39d4d3a1ef1d7b651ccb53f (patch)
tree80adb82970e935dc10d6a55988ba9c0a21d2d025 /source
parenta205c56a75c93c82796fd68687e8c0db26459073 (diff)
downloadsamba-5ebcb9081e435d54c39d4d3a1ef1d7b651ccb53f.tar.gz
samba-5ebcb9081e435d54c39d4d3a1ef1d7b651ccb53f.tar.xz
samba-5ebcb9081e435d54c39d4d3a1ef1d7b651ccb53f.zip
r53: Remove modifyTimestamp from list of our attributes. We just check it for
cache entry time comparisons in password lockout. Fixes problems where pdb_ldap tries to delete the operational attribute modifyTimestamp when deleting a user account.
Diffstat (limited to 'source')
-rw-r--r--source/include/smbldap.h1
-rw-r--r--source/lib/smbldap.c1
-rw-r--r--source/passdb/pdb_ldap.c9
3 files changed, 4 insertions, 7 deletions
diff --git a/source/include/smbldap.h b/source/include/smbldap.h
index 68a2c00afe0..2f71f971d92 100644
--- a/source/include/smbldap.h
+++ b/source/include/smbldap.h
@@ -92,7 +92,6 @@
#define LDAP_ATTR_LOGON_COUNT 36
#define LDAP_ATTR_MUNGED_DIAL 37
#define LDAP_ATTR_BAD_PASSWORD_TIME 38
-#define LDAP_ATTR_MOD_TIMESTAMP 39
typedef struct _attrib_map_entry {
int attrib;
diff --git a/source/lib/smbldap.c b/source/lib/smbldap.c
index 18979e2f76f..f4f0170479f 100644
--- a/source/lib/smbldap.c
+++ b/source/lib/smbldap.c
@@ -100,7 +100,6 @@ ATTRIB_MAP_ENTRY attrib_map_v30[] = {
{ LDAP_ATTR_MUNGED_DIAL, "sambaMungedDial" },
{ LDAP_ATTR_BAD_PASSWORD_COUNT, "sambaBadPasswordCount" },
{ LDAP_ATTR_BAD_PASSWORD_TIME, "sambaBadPasswordTime" },
- { LDAP_ATTR_MOD_TIMESTAMP, "modifyTimestamp" },
{ LDAP_ATTR_LIST_END, NULL }
};
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 689c7010418..307d187f667 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -81,6 +81,8 @@
#define SAM_ACCOUNT struct sam_passwd
#endif
+#define MODIFY_TIMESTAMP_STRING "modifyTimestamp"
+
#include "smbldap.h"
struct ldapsam_privates {
@@ -398,11 +400,8 @@ static time_t ldapsam_get_entry_timestamp(
pstring temp;
struct tm tm;
- if (!smbldap_get_single_pstring(
- ldap_state->smbldap_state->ldap_struct, entry,
- get_userattr_key2string(ldap_state->schema_ver,
- LDAP_ATTR_MOD_TIMESTAMP),
- temp))
+ if (!smbldap_get_single_pstring(ldap_state->smbldap_state->ldap_struct,
+ entry, MODIFY_TIMESTAMP_STRING, temp))
return (time_t) 0;
strptime(temp, "%Y%m%d%H%M%SZ", &tm);