sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-24 21:49:29 +03:00
Code Activity

r19206: Jeremy, for some reason storing a value-less entry in TDB does not work

Browse Source 
anymore in 3_0. I'm just adding a time(NULL) as value for the
WINBINDD_OFFLINE key.

Guenther
(This used to be commit 2bdf9f140f)
This commit is contained in:
Günther Deschner
2006-10-09 15:11:37 +00:00
committed by Gerald (Jerry) Carter
parent 9d20474a48
commit b405a39714
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source3/nsswitch/winbindd_cache.c
View File

@ -2523,7 +2523,6 @@ done:
BOOL set_global_winbindd_state_offline(void)
{
TDB_DATA data;
int err;
DEBUG(10,("set_global_winbindd_state_offline: offline requested.\n"));
@ -2545,21 +2544,16 @@ BOOL set_global_winbindd_state_offline(void)
return True;
}
/* wcache->tdb->ecode = 0; */
data = tdb_fetch_bystring( wcache->tdb, "WINBINDD_OFFLINE" );
/* As this is a key with no data we don't need to free, we
check for existence by looking at tdb_err. */
err = tdb_error(wcache->tdb);
if (err == TDB_ERR_NOEXIST) {
if (!data.dptr || data.dsize != 4) {
DEBUG(10,("set_global_winbindd_state_offline: offline state not set.\n"));
SAFE_FREE(data.dptr);
return False;
} else {
DEBUG(10,("set_global_winbindd_state_offline: offline state set.\n"));
global_winbindd_offline_state = True;
SAFE_FREE(data.dptr);
return True;
}
}

20
source3/utils/smbcontrol.c
View File

@ -882,25 +882,27 @@ static BOOL do_winbind_offline(const struct process_id pid,
5 times. */
for (retry = 0; retry < 5; retry++) {
int err;
TDB_DATA d;
char buf[4];
ZERO_STRUCT(d);
SIVAL(buf, 0, time(NULL));
d.dptr = buf;
d.dsize = 4;
tdb_store_bystring(tdb, "WINBINDD_OFFLINE", d, TDB_INSERT);
ret = send_message(pid, MSG_WINBIND_OFFLINE, NULL, 0, False);
/* Check that the entry "WINBINDD_OFFLINE" still exists. */
/* tdb->ecode = TDB_SUCCESS; */
d = tdb_fetch_bystring( tdb, "WINBINDD_OFFLINE" );
/* As this is a key with no data we don't need to free, we
check for existence by looking at tdb_err. */
err = tdb_error(tdb);
if (err == TDB_ERR_NOEXIST) {
if (!d.dptr || d.dsize != 4) {
SAFE_FREE(d.dptr);
DEBUG(10,("do_winbind_offline: offline state not set - retrying.\n"));
} else {
SAFE_FREE(d.dptr);
break;
}
}