diff options
| author | Volker Lendecke <vl@samba.org> | 2010-03-16 22:22:21 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-03-16 22:35:41 +0100 |
| commit | 2b4ce9a73f6b041f3cc69125e45b9f61e0155ff5 (patch) | |
| tree | bfce27cd38655a7b039e74033850170bf92aa523 /source3 | |
| parent | 276b1aa1891df2a31e8c65b04f41b0a0ebb57335 (diff) | |
| download | samba-2b4ce9a73f6b041f3cc69125e45b9f61e0155ff5.tar.gz samba-2b4ce9a73f6b041f3cc69125e45b9f61e0155ff5.tar.bz2 samba-2b4ce9a73f6b041f3cc69125e45b9f61e0155ff5.zip | |
s3: Make login_cache_write take a pointer
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/passdb/login_cache.c | 13 | ||||
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 68a3e5cf7b..ad95863d81 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4410,7 +4410,8 @@ char* get_string_param( const char* param ); bool login_cache_init(void); bool login_cache_shutdown(void); bool login_cache_read(struct samu *sampass, struct login_cache *entry); -bool login_cache_write(const struct samu *sampass, struct login_cache entry); +bool login_cache_write(const struct samu *sampass, + const struct login_cache *entry); bool login_cache_delentry(const struct samu *sampass); /* The following definitions come from passdb/lookup_sid.c */ diff --git a/source3/passdb/login_cache.c b/source3/passdb/login_cache.c index 2f9f000f11..cf6c796321 100644 --- a/source3/passdb/login_cache.c +++ b/source3/passdb/login_cache.c @@ -112,13 +112,14 @@ bool login_cache_read(struct samu *sampass, struct login_cache *entry) return true; } -bool login_cache_write(const struct samu *sampass, struct login_cache entry) +bool login_cache_write(const struct samu *sampass, + const struct login_cache *entry) { char *keystr; TDB_DATA databuf; bool ret; uint32_t entry_timestamp; - uint32_t bad_password_time = (uint32_t)entry.bad_password_time; + uint32_t bad_password_time = entry->bad_password_time; if (!login_cache_init()) return False; @@ -138,8 +139,8 @@ bool login_cache_write(const struct samu *sampass, struct login_cache entry) databuf.dsize = tdb_pack(NULL, 0, SAM_CACHE_FORMAT, entry_timestamp, - entry.acct_ctrl, - entry.bad_password_count, + entry->acct_ctrl, + entry->bad_password_count, bad_password_time); databuf.dptr = SMB_MALLOC_ARRAY(uint8, databuf.dsize); if (!databuf.dptr) { @@ -149,8 +150,8 @@ bool login_cache_write(const struct samu *sampass, struct login_cache entry) if (tdb_pack(databuf.dptr, databuf.dsize, SAM_CACHE_FORMAT, entry_timestamp, - entry.acct_ctrl, - entry.bad_password_count, + entry->acct_ctrl, + entry->bad_password_count, bad_password_time) != databuf.dsize) { SAFE_FREE(keystr); diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index b3eb37501c..4ff718ebdb 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -1518,7 +1518,7 @@ static bool init_ldap_from_sam (struct ldapsam_privates *ldap_state, cache_entry.bad_password_time = badtime; DEBUG(7, ("Updating bad password count and time in login cache\n")); - login_cache_write(sampass, cache_entry); + login_cache_write(sampass, &cache_entry); } } |