diff options
| author | Jim McDonough <jmcd@samba.org> | 2004-04-05 14:45:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:06 -0500 |
| commit | a15393a3d9cdefc776cd7adb42ff50f61b9eff69 (patch) | |
| tree | 15389a2e3a72da638d07782c21e09cbc0fb860b9 | |
| parent | bca29e537741da5a361bb28b0246d1bfac326434 (diff) | |
| download | samba-a15393a3d9cdefc776cd7adb42ff50f61b9eff69.tar.gz samba-a15393a3d9cdefc776cd7adb42ff50f61b9eff69.tar.bz2 samba-a15393a3d9cdefc776cd7adb42ff50f61b9eff69.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.
(This used to be commit 5ebcb9081e435d54c39d4d3a1ef1d7b651ccb53f)
| -rw-r--r-- | source3/include/smbldap.h | 1 | ||||
| -rw-r--r-- | source3/lib/smbldap.c | 1 | ||||
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 9 |
3 files changed, 4 insertions, 7 deletions
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index 68a2c00afe..2f71f971d9 100644 --- a/source3/include/smbldap.h +++ b/source3/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/source3/lib/smbldap.c b/source3/lib/smbldap.c index 18979e2f76..f4f0170479 100644 --- a/source3/lib/smbldap.c +++ b/source3/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/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 689c701041..307d187f66 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/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); |