sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

r23769: Move removal of the tdb from the generic tdb_validate function

Browse Source 
to the caller (winbindd_validate_cache in this case).
Next, there will be a backup handling for the tdb files.

Michael
(This used to be commit 821bc84109)
This commit is contained in:
Michael Adam 2007-07-09 15:34:46 +00:00 committed by Gerald (Jerry) Carter
parent 5daa21f558
commit 5e4962d9e7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/lib/util_tdb.c
View File

@ -1118,12 +1118,6 @@ int tdb_validate(const char *tdb_path, tdb_validate_data_func validate_fn)
DEBUGADD(10, (" => overall success: %s\n", v_status.success ? "yes" : "no")); DEBUGADD(10, (" => overall success: %s\n", v_status.success ? "yes" : "no"));
} }
if (!v_status.success) {
DEBUG(10, ("tdb_validate: validation not successful.\n"));
DEBUGADD(10, ("removing tdb %s.\n", tdb_path));
unlink(tdb_path);
}
DEBUG(10, ("tdb_validate: waiting for child to finish...\n")); DEBUG(10, ("tdb_validate: waiting for child to finish...\n"));
while ((wait_pid = sys_waitpid(child_pid, &child_status, 0)) < 0) { while ((wait_pid = sys_waitpid(child_pid, &child_status, 0)) < 0) {
if (errno == EINTR) { if (errno == EINTR) {

6
source3/nsswitch/winbindd_cache.c
View File

@ -3304,6 +3304,12 @@ int winbindd_validate_cache(void)
ret = tdb_validate(lock_path("winbindd_cache.tdb"), ret = tdb_validate(lock_path("winbindd_cache.tdb"),
cache_traverse_validate_fn); cache_traverse_validate_fn);
if (ret != 0) {
DEBUG(10, ("winbindd_validate_cache: validation not successful.\n"));
DEBUGADD(10, ("removing tdb %s.\n", tdb_path));
unlink(tdb_path);
}
done: done:
DEBUG(10, ("winbindd_validate_cache: restoring panic function\n")); DEBUG(10, ("winbindd_validate_cache: restoring panic function\n"));
smb_panic_fn = smb_panic; smb_panic_fn = smb_panic;