Add check for WINBIND_OFFLINE key.

Jeremy.

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_0@19958 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c
index 41662900ce725d2d277bf661a4432bf6c03fc91f..047b6c3b854cc858ff1cb0d7a29c57cbac635680 100644 (file)
--- a/source/nsswitch/winbindd.c
+++ b/source/nsswitch/winbindd.c
@@ -1022,6 +1022,9 @@ int main(int argc, char **argv, char **envp)
 
        pidfile_create("winbindd");
 
+       /* Ensure all cache and idmap caches are consistent
+          before we startup. */
+
        if (winbindd_validate_cache()) {
                /* We have a bad cache, but luckily we
                   just deleted it. Restart ourselves */
@@ -1051,9 +1054,6 @@ int main(int argc, char **argv, char **envp)
                exit(1);
        }
        
-       /* Ensure all cache and idmap caches are consistent
-          before we startup. */
-
        /* React on 'smbcontrol winbindd reload-config' in the same way
           as to SIGHUP signal */
        message_register(MSG_SMB_CONF_UPDATED, msg_reload_services);

diff --git a/source/nsswitch/winbindd_cache.c b/source/nsswitch/winbindd_cache.c
index e9b0d2e8f9a68c7a9b17796f68c29ed394d83339..436f5d187405ad5e0c2bb3f5009f1f668513917d 100644 (file)
--- a/source/nsswitch/winbindd_cache.c
+++ b/source/nsswitch/winbindd_cache.c
@@ -2663,6 +2663,11 @@ static int validate_trustdoms(TDB_DATA kbuf, TDB_DATA dbuf)
        return 0;
 }
 
+static int validate_offline(TDB_DATA kbuf, TDB_DATA dbuf)
+{
+       return 0;
+}
+
 /***********************************************************************
  A list of all possible cache tdb keys with associated validation
  functions.
@@ -2685,6 +2690,7 @@ struct key_val_struct {
        {"UA", validate_ua},
        {"GM/", validate_gm},
        {"TRUSTDOMS/", validate_trustdoms},
+       {"WINBINDD_OFFLINE", validate_offline},
        {NULL, NULL}
 };