diff options
| author | Jim McDonough <jmcd@samba.org> | 2004-04-05 15:59:52 +0000 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2004-04-05 15:59:52 +0000 |
| commit | e5a676b4bf68cb0323fc5cdf6ac3f8eeab5d2b5d (patch) | |
| tree | fc3c0c608c964122384474cfeb870f86d2b9fe3b | |
| parent | cee6abc404427847e9a0048d9ed1d6bdd5178f5b (diff) | |
| download | samba-e5a676b4bf68cb0323fc5cdf6ac3f8eeab5d2b5d.tar.gz samba-e5a676b4bf68cb0323fc5cdf6ac3f8eeab5d2b5d.tar.xz samba-e5a676b4bf68cb0323fc5cdf6ac3f8eeab5d2b5d.zip | |
r54: merge from 3.0: remove modifyTimestamp from our list of attributes
| -rw-r--r-- | source/include/smbldap.h | 2 | ||||
| -rw-r--r-- | source/lib/smbldap.c | 1 | ||||
| -rw-r--r-- | source/passdb/pdb_ldap.c | 9 |
3 files changed, 5 insertions, 7 deletions
diff --git a/source/include/smbldap.h b/source/include/smbldap.h index 119479f218d..69f20acdfac 100644 --- a/source/include/smbldap.h +++ b/source/include/smbldap.h @@ -94,7 +94,7 @@ #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 + #define LDAP_ATTR_SID_LIST 40 typedef struct _attrib_map_entry { diff --git a/source/lib/smbldap.c b/source/lib/smbldap.c index 14a46fc5fb0..6118643713f 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 23ab0f9965d..8024db0937d 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); |