summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/include/passdb.h4
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/passdb/login_cache.c9
-rw-r--r--source3/passdb/pdb_ldap.c4
4 files changed, 11 insertions, 10 deletions
diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index 9be2a697a6..3ebf72d960 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -104,12 +104,12 @@ enum pdb_value_state {
#define IS_SAM_DEFAULT(x, flag) (pdb_get_init_flags(x, flag) == PDB_DEFAULT)
/* cache for bad password lockout data, to be used on replicated SAMs */
-typedef struct logon_cache_struct {
+struct login_cache {
time_t entry_timestamp;
uint32 acct_ctrl;
uint16 bad_password_count;
time_t bad_password_time;
-} LOGIN_CACHE;
+};
#define SAMU_BUFFER_V0 0
#define SAMU_BUFFER_V1 1
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6e210de458..f2ba8e3b24 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4409,8 +4409,8 @@ char* get_string_param( const char* param );
bool login_cache_init(void);
bool login_cache_shutdown(void);
-LOGIN_CACHE * login_cache_read(struct samu *sampass);
-bool login_cache_write(const struct samu *sampass, LOGIN_CACHE entry);
+struct login_cache * login_cache_read(struct samu *sampass);
+bool login_cache_write(const struct samu *sampass, 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 5e7e9a0b50..6ac6d52a63 100644
--- a/source3/passdb/login_cache.c
+++ b/source3/passdb/login_cache.c
@@ -63,11 +63,11 @@ bool login_cache_shutdown(void)
}
/* if we can't read the cache, oh well, no need to return anything */
-LOGIN_CACHE * login_cache_read(struct samu *sampass)
+struct login_cache * login_cache_read(struct samu *sampass)
{
char *keystr;
TDB_DATA databuf;
- LOGIN_CACHE *entry;
+ struct login_cache *entry;
uint32_t entry_timestamp = 0, bad_password_time = 0;
if (!login_cache_init())
@@ -88,7 +88,8 @@ LOGIN_CACHE * login_cache_read(struct samu *sampass)
databuf = tdb_fetch_bystring(cache, keystr);
SAFE_FREE(keystr);
- if (!(entry = SMB_MALLOC_P(LOGIN_CACHE))) {
+ entry = SMB_MALLOC_P(struct login_cache);
+ if (entry == NULL) {
DEBUG(1, ("Unable to allocate cache entry buffer!\n"));
SAFE_FREE(databuf.dptr);
return NULL;
@@ -118,7 +119,7 @@ LOGIN_CACHE * login_cache_read(struct samu *sampass)
return entry;
}
-bool login_cache_write(const struct samu *sampass, LOGIN_CACHE entry)
+bool login_cache_write(const struct samu *sampass, struct login_cache entry)
{
char *keystr;
TDB_DATA databuf;
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index d079262ee8..1e3413e381 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -540,7 +540,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
uint32 hours_len;
uint8 hours[MAX_HOURS_LEN];
char *temp = NULL;
- LOGIN_CACHE *cache_entry = NULL;
+ struct login_cache *cache_entry = NULL;
uint32 pwHistLen;
bool expand_explicit = lp_passdb_expand_explicit();
bool ret = false;
@@ -1511,7 +1511,7 @@ static bool init_ldap_from_sam (struct ldapsam_privates *ldap_state,
DEBUG(7, ("bad password count is reset, deleting login cache entry for %s\n", pdb_get_nt_username(sampass)));
login_cache_delentry(sampass);
} else {
- LOGIN_CACHE cache_entry;
+ struct login_cache cache_entry;
cache_entry.entry_timestamp = time(NULL);
cache_entry.acct_ctrl = pdb_get_acct_ctrl(sampass);