summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-03-16 22:08:37 +0100
committerVolker Lendecke <vl@samba.org>2010-03-16 22:35:41 +0100
commit13a278c1b901cadef7e09d1dc6a89d935ebb73ea (patch)
treeb5c8f12b6ee47d30a3f0f73cd39ae18f4c785a07 /source3/passdb
parent02d7cdc671e27b5ed717c4c0e088b8457caa6e4a (diff)
downloadsamba-13a278c1b901cadef7e09d1dc6a89d935ebb73ea.tar.gz
samba-13a278c1b901cadef7e09d1dc6a89d935ebb73ea.tar.bz2
samba-13a278c1b901cadef7e09d1dc6a89d935ebb73ea.zip
s3: Remove a typedef
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/login_cache.c9
-rw-r--r--source3/passdb/pdb_ldap.c4
2 files changed, 7 insertions, 6 deletions
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);