Changeset 222 for branches/samba-3.3.x/source/winbindd/winbindd_cache.c

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

File:

• branches/samba-3.3.x/source/winbindd/winbindd_cache.c (modified) (4 diffs)

branches/samba-3.3.x/source/winbindd/winbindd_cache.c

@@ -34 +34 @@
 
 extern struct winbindd_methods reconnect_methods;
-extern bool opt_nocache;
 #ifdef HAVE_ADS
 extern struct winbindd_methods ads_methods;
@@ -632 +631 @@
         struct cache_entry *centry;
 
-        if (opt_nocache) {
+        if (!winbindd_use_cache()) {
                 return NULL;
         }
@@ -834 +833 @@
         TDB_DATA key, data;
 
-        if (opt_nocache) {
+        if (!winbindd_use_cache()) {
                 return;
         }
@@ -2861 +2860 @@
                 wcache->tdb = NULL;
         }
-        if (opt_nocache)
+        if (!winbindd_use_cache()) {
                 return;
+        }
 
         /* when working offline we must not clear the cache on restart */