/*
Unix SMB/CIFS implementation.
- SAM_ACCOUNT local cache for
+ struct samu local cache for
Copyright (C) Jim McDonough (jmcd@us.ibm.com) 2004.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
static TDB_CONTEXT *cache;
-BOOL login_cache_init(void)
+bool login_cache_init(void)
{
char* cache_fname = NULL;
/* skip file open if it's already opened */
if (cache) return True;
- asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE);
- if (cache_fname)
- DEBUG(5, ("Opening cache file at %s\n", cache_fname));
- else {
+ cache_fname = cache_path(LOGIN_CACHE_FILE);
+ if (cache_fname == NULL) {
DEBUG(0, ("Filename allocation failed.\n"));
return False;
}
+ DEBUG(5, ("Opening cache file at %s\n", cache_fname));
+
cache = tdb_open_log(cache_fname, 0, TDB_DEFAULT,
O_RDWR|O_CREAT, 0644);
if (!cache)
DEBUG(5, ("Attempt to open %s failed.\n", cache_fname));
- SAFE_FREE(cache_fname);
+ TALLOC_FREE(cache_fname);
return (cache ? True : False);
}
-BOOL login_cache_shutdown(void)
+bool login_cache_shutdown(void)
{
/* tdb_close routine returns -1 on error */
if (!cache) return False;
}
/* if we can't read the cache, oh well, no need to return anything */
-LOGIN_CACHE * login_cache_read(SAM_ACCOUNT *sampass)
+LOGIN_CACHE * login_cache_read(struct samu *sampass)
{
- TDB_DATA keybuf, databuf;
+ char *keystr;
+ TDB_DATA databuf;
LOGIN_CACHE *entry;
+ uint32_t entry_timestamp = 0, bad_password_time = 0;
if (!login_cache_init())
return NULL;
- keybuf.dptr = strdup(pdb_get_nt_username(sampass));
- if (!keybuf.dptr || !strlen(keybuf.dptr)) {
- SAFE_FREE(keybuf.dptr);
+ if (pdb_get_nt_username(sampass) == NULL) {
+ return NULL;
+ }
+
+ keystr = SMB_STRDUP(pdb_get_nt_username(sampass));
+ if (!keystr || !keystr[0]) {
+ SAFE_FREE(keystr);
return NULL;
}
- keybuf.dsize = strlen(keybuf.dptr) + 1;
DEBUG(7, ("Looking up login cache for user %s\n",
- keybuf.dptr));
- databuf = tdb_fetch(cache, keybuf);
- SAFE_FREE(keybuf.dptr);
+ keystr));
+ databuf = tdb_fetch_bystring(cache, keystr);
+ SAFE_FREE(keystr);
- if (!(entry = malloc(sizeof(LOGIN_CACHE)))) {
+ if (!(entry = SMB_MALLOC_P(LOGIN_CACHE))) {
DEBUG(1, ("Unable to allocate cache entry buffer!\n"));
SAFE_FREE(databuf.dptr);
return NULL;
}
+ ZERO_STRUCTP(entry);
if (tdb_unpack (databuf.dptr, databuf.dsize, SAM_CACHE_FORMAT,
- &entry->entry_timestamp, &entry->acct_ctrl,
- &entry->bad_password_count,
- &entry->bad_password_time) == -1) {
+ &entry_timestamp,
+ &entry->acct_ctrl,
+ &entry->bad_password_count,
+ &bad_password_time) == -1) {
DEBUG(7, ("No cache entry found\n"));
+ SAFE_FREE(entry);
SAFE_FREE(databuf.dptr);
return NULL;
}
+ /* Deal with possible 64-bit time_t. */
+ entry->entry_timestamp = (time_t)entry_timestamp;
+ entry->bad_password_time = (time_t)bad_password_time;
+
+ SAFE_FREE(databuf.dptr);
+
DEBUG(5, ("Found login cache entry: timestamp %12u, flags 0x%x, count %d, time %12u\n",
(unsigned int)entry->entry_timestamp, entry->acct_ctrl,
entry->bad_password_count, (unsigned int)entry->bad_password_time));
return entry;
}
-BOOL login_cache_write(const SAM_ACCOUNT *sampass, LOGIN_CACHE entry)
+bool login_cache_write(const struct samu *sampass, LOGIN_CACHE entry)
{
-
- TDB_DATA keybuf, databuf;
- BOOL ret;
+ char *keystr;
+ TDB_DATA databuf;
+ bool ret;
+ uint32_t entry_timestamp;
+ uint32_t bad_password_time = (uint32_t)entry.bad_password_time;
if (!login_cache_init())
return False;
- keybuf.dptr = strdup(pdb_get_nt_username(sampass));
- if (!keybuf.dptr || !strlen(keybuf.dptr)) {
- SAFE_FREE(keybuf.dptr);
+ if (pdb_get_nt_username(sampass) == NULL) {
return False;
}
- keybuf.dsize = strlen(keybuf.dptr) + 1;
- entry.entry_timestamp = time(NULL);
+ keystr = SMB_STRDUP(pdb_get_nt_username(sampass));
+ if (!keystr || !keystr[0]) {
+ SAFE_FREE(keystr);
+ return False;
+ }
+
+ entry_timestamp = (uint32_t)time(NULL);
databuf.dsize =
tdb_pack(NULL, 0, SAM_CACHE_FORMAT,
- entry.entry_timestamp,
+ entry_timestamp,
entry.acct_ctrl,
entry.bad_password_count,
- entry.bad_password_time);
- databuf.dptr = malloc(databuf.dsize);
+ bad_password_time);
+ databuf.dptr = SMB_MALLOC_ARRAY(uint8, databuf.dsize);
if (!databuf.dptr) {
- SAFE_FREE(keybuf.dptr);
+ SAFE_FREE(keystr);
return False;
}
if (tdb_pack(databuf.dptr, databuf.dsize, SAM_CACHE_FORMAT,
- entry.entry_timestamp,
+ entry_timestamp,
entry.acct_ctrl,
entry.bad_password_count,
- entry.bad_password_time)
+ bad_password_time)
!= databuf.dsize) {
- SAFE_FREE(keybuf.dptr);
+ SAFE_FREE(keystr);
SAFE_FREE(databuf.dptr);
return False;
}
- ret = tdb_store(cache, keybuf, databuf, 0);
- SAFE_FREE(keybuf.dptr);
+ ret = tdb_store_bystring(cache, keystr, databuf, 0);
+ SAFE_FREE(keystr);
SAFE_FREE(databuf.dptr);
return ret == 0;
}
-BOOL login_cache_delentry(const SAM_ACCOUNT *sampass)
+bool login_cache_delentry(const struct samu *sampass)
{
int ret;
- TDB_DATA keybuf;
+ char *keystr;
if (!login_cache_init())
return False;
- keybuf.dptr = strdup(pdb_get_nt_username(sampass));
- if (!keybuf.dptr || !strlen(keybuf.dptr)) {
- SAFE_FREE(keybuf.dptr);
+ if (pdb_get_nt_username(sampass) == NULL) {
+ return False;
+ }
+
+ keystr = SMB_STRDUP(pdb_get_nt_username(sampass));
+ if (!keystr || !keystr[0]) {
+ SAFE_FREE(keystr);
return False;
}
- keybuf.dsize = strlen(keybuf.dptr) + 1;
- DEBUG(9, ("About to delete entry for %s\n", keybuf.dptr));
- ret = tdb_delete(cache, keybuf);
+
+ DEBUG(9, ("About to delete entry for %s\n", keystr));
+ ret = tdb_delete_bystring(cache, keystr);
DEBUG(9, ("tdb_delete returned %d\n", ret));
- SAFE_FREE(keybuf.dptr);
+ SAFE_FREE(keystr);
return ret == 0;
}
-
git.samba.org / ira / wip.git / blobdiff