From 290a7f02750d7146fe55fd400925bfaf9d5585b4 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 9 Mar 2009 21:46:59 +0100
Subject: [PATCH] Make opt_nocache static to winbindd.c (cherry picked from
 commit 9ad5e570625acc76fad7f5cb8134461662ba857a)

---
 source/winbindd/winbindd.c       | 12 +++++++++++-
 source/winbindd/winbindd_cache.c |  8 ++++----
 source/winbindd/winbindd_group.c |  2 --
 source/winbindd/winbindd_proto.h |  2 ++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index a914c5c9a93..f333e3766e0 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -28,7 +28,7 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-bool opt_nocache = False;
+static bool opt_nocache = False;
 static bool interactive = False;
 
 extern bool override_logfile;
@@ -996,6 +996,16 @@ static void process_loop(void)
 	}
 }
 
+bool winbindd_use_idmap_cache(void)
+{
+	return !opt_nocache;
+}
+
+bool winbindd_use_cache(void)
+{
+	return !opt_nocache;
+}
+
 /* Main function */
 
 int main(int argc, char **argv, char **envp)
diff --git a/source/winbindd/winbindd_cache.c b/source/winbindd/winbindd_cache.c
index 7688ff46b9c..5d2b1f58710 100644
--- a/source/winbindd/winbindd_cache.c
+++ b/source/winbindd/winbindd_cache.c
@@ -33,7 +33,6 @@
 #define WINBINDD_CACHE_VERSION_KEYSTR "WINBINDD_CACHE_VERSION"
 
 extern struct winbindd_methods reconnect_methods;
-extern bool opt_nocache;
 #ifdef HAVE_ADS
 extern struct winbindd_methods ads_methods;
 #endif
@@ -631,7 +630,7 @@ static struct cache_entry *wcache_fetch(struct winbind_cache *cache,
 	char *kstr;
 	struct cache_entry *centry;
 
-	if (opt_nocache) {
+	if (!winbindd_use_cache()) {
 		return NULL;
 	}
 
@@ -833,7 +832,7 @@ static void centry_end(struct cache_entry *centry, const char *format, ...)
 	char *kstr;
 	TDB_DATA key, data;
 
-	if (opt_nocache) {
+	if (!winbindd_use_cache()) {
 		return;
 	}
 
@@ -2860,8 +2859,9 @@ void wcache_flush_cache(void)
 		tdb_close(wcache->tdb);
 		wcache->tdb = NULL;
 	}
-	if (opt_nocache)
+	if (!winbindd_use_cache()) {
 		return;
+	}
 
 	/* when working offline we must not clear the cache on restart */
 	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
diff --git a/source/winbindd/winbindd_group.c b/source/winbindd/winbindd_group.c
index 9d9b264124f..a4b118c39a5 100644
--- a/source/winbindd/winbindd_group.c
+++ b/source/winbindd/winbindd_group.c
@@ -25,8 +25,6 @@
 #include "includes.h"
 #include "winbindd.h"
 
-extern bool opt_nocache;
-
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
diff --git a/source/winbindd/winbindd_proto.h b/source/winbindd/winbindd_proto.h
index 6d596482783..3909d16b618 100644
--- a/source/winbindd/winbindd_proto.h
+++ b/source/winbindd/winbindd_proto.h
@@ -67,6 +67,8 @@ void request_error(struct winbindd_cli_state *state);
 void request_ok(struct winbindd_cli_state *state);
 void winbind_check_sighup(const char *lfile);
 void winbind_check_sigterm(bool in_parent);
+bool winbindd_use_idmap_cache(void);
+bool winbindd_use_cache(void);
 int main(int argc, char **argv, char **envp);
 
 /* The following definitions come from winbindd/winbindd_ads.c  */
-- 
2.11.4.GIT