diff options
| author | Michael Adam <obnox@samba.org> | 2007-07-09 15:34:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:55 -0500 |
| commit | 5e4962d9e78caab4a4294dd0ae3e4a6caf179d77 (patch) | |
| tree | 9d0c3cd0d844274e7137aea2fa3ece512a65be1b /source3 | |
| parent | 5daa21f558217d727e4f1d42b778e1beea69af4c (diff) | |
| download | samba-5e4962d9e78caab4a4294dd0ae3e4a6caf179d77.tar.gz samba-5e4962d9e78caab4a4294dd0ae3e4a6caf179d77.tar.bz2 samba-5e4962d9e78caab4a4294dd0ae3e4a6caf179d77.zip | |
r23769: Move removal of the tdb from the generic tdb_validate function
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 821bc84109625c9d85edee38fa26d16f9f0a0fe2)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/util_tdb.c | 6 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_cache.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c index 5f9a5115b6..564edffdac 100644 --- a/source3/lib/util_tdb.c +++ b/source3/lib/util_tdb.c @@ -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")); } - 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")); while ((wait_pid = sys_waitpid(child_pid, &child_status, 0)) < 0) { if (errno == EINTR) { diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c index cfd182666e..67d689a5f3 100644 --- a/source3/nsswitch/winbindd_cache.c +++ b/source3/nsswitch/winbindd_cache.c @@ -3304,6 +3304,12 @@ int winbindd_validate_cache(void) ret = tdb_validate(lock_path("winbindd_cache.tdb"), 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: DEBUG(10, ("winbindd_validate_cache: restoring panic function\n")); smb_panic_fn = smb_panic; |