From b884db5c47a958188d9570f78093b9443b48b9cc Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 10 Apr 2008 11:53:53 +0200 Subject: winbindd: only call winbindd_validate_cache when not in offline logon mode. originally, the cache was cleared before calling validate, but this way, we skipt the validation of the database when not in offline logon mode. This is put into a new wrapper function winbindd_cache_validate_and_initialize() which is now called in winbindd.c instead calling validate and initialize functions separately. Michael (This used to be commit 641b5e3fecfce9581536de8daf6d7e6ecbefaf34) --- source3/winbindd/winbindd_cache.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source3/winbindd/winbindd_cache.c') diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index e4b0a53d5d..ddb0ab317e 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -3476,6 +3476,20 @@ int winbindd_validate_cache_nobackup(void) return ret; } +bool winbindd_cache_validate_and_initialize(void) +{ + close_winbindd_cache(); + + if (lp_winbind_offline_logon()) { + if (winbindd_validate_cache() < 0) { + DEBUG(0, ("winbindd cache tdb corrupt and no backup " + "could be restored.\n")); + } + } + + return initialize_winbindd_cache(); +} + /********************************************************************* ********************************************************************/ -- cgit